You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

87 lines
2.8 KiB

Index: configure
--- configure.orig 2021-12-04 21:10:38.000000000 +0100
+++ configure 2021-12-29 10:45:11.203283000 +0100
@@ -22272,7 +22272,9 @@
LUA_INCLUDES=""
LUA_LIBS=""
- LUA_INSTALL_DIR=""
+ if test -z "$LUA_INSTALL_DIR" ; then
+ LUA_INSTALL_DIR=""
+ fi
if test -n "$lua_inc"; then
CFLAGS="$CFLAGS -I$lua_inc"
@@ -22291,13 +22293,13 @@
pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null`
if test "x$?" = "x0" ; then
LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
- LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lua$l`
LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
if test "x$?" = "x0"; then
- LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lualib$l`
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lualib$l`
LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
fi
break
Index: lib/ortho/trapezoid.c
--- lib/ortho/trapezoid.c.orig 2021-12-04 21:10:28.000000000 +0100
+++ lib/ortho/trapezoid.c 2021-12-29 10:45:11.203563000 +0100
@@ -22,6 +22,11 @@
#include <common/types.h>
#include <ortho/trap.h>
+#include <sys/param.h>
+#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
+#define log2(x) (log(x)/log(2))
+#endif
+
/* Node types */
#define T_X 1
Index: lib/sfio/sfhdr.h
--- lib/sfio/sfhdr.h.orig 2021-12-29 10:45:11.203778000 +0100
+++ lib/sfio/sfhdr.h 2021-12-29 10:45:50.621184000 +0100
@@ -27,6 +27,10 @@
#include <sfio/sfio_t.h>
#include "config.h"
+#ifndef va_copy
+#define va_copy(to,fr) ((to)=(fr))
+#endif
+
#if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE)
#define _NO_LARGEFILE64_SOURCE 1
#endif
Index: plugin/gd/gvrender_gd.c
--- plugin/gd/gvrender_gd.c.orig 2021-12-04 21:10:28.000000000 +0100
+++ plugin/gd/gvrender_gd.c 2021-12-29 10:45:11.204036000 +0100
@@ -23,6 +23,10 @@
#define NOTUSED(x) (void) (x)
+#ifndef HAVE_GD_FONTCONFIG
+#define HAVE_GD_FONTCONFIG
+#endif
+
typedef enum {
FORMAT_GIF,
FORMAT_JPEG,
Index: plugin/gd/gvtextlayout_gd.c
--- plugin/gd/gvtextlayout_gd.c.orig 2021-12-04 21:10:28.000000000 +0100
+++ plugin/gd/gvtextlayout_gd.c 2021-12-29 10:45:11.204155000 +0100
@@ -17,6 +17,10 @@
#include <gd.h>
#include <cgraph/strcasecmp.h>
+#ifndef HAVE_GD_FONTCONFIG
+#define HAVE_GD_FONTCONFIG
+#endif
+
#ifdef HAVE_GD_FREETYPE
/* fontsize at which text is omitted entirely */