diff options
7 files changed, 41 insertions, 12 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 17abe52ef..9ace60438 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib PKG_VERSION:= 10.1.0 PKG_SUBVER:= 10.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs diff --git a/package/MesaLib/patches/patch-configure_ac b/package/MesaLib/patches/patch-configure_ac index c788ea1cd..32b3d8053 100644 --- a/package/MesaLib/patches/patch-configure_ac +++ b/package/MesaLib/patches/patch-configure_ac @@ -1,6 +1,6 @@ ---- Mesa-9.2.2.orig/configure.ac 2013-10-19 01:36:09.000000000 +0200 -+++ Mesa-9.2.2/configure.ac 2013-12-01 14:08:00.000000000 +0100 -@@ -69,7 +69,7 @@ AC_PATH_PROG([PERL], [perl]) +--- Mesa-10.1.0.orig/configure.ac 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/configure.ac 2014-03-14 21:36:14.000000000 +0100 +@@ -65,7 +65,7 @@ AC_PATH_PROG([PERL], [perl]) AC_CHECK_PROG(INDENT, indent, indent, cat) if test "x$INDENT" != "xcat"; then diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h index 021601b7f..b929e8758 100644 --- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h +++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h @@ -1,6 +1,6 @@ ---- Mesa-9.2.2.orig/src/gallium/include/pipe/p_config.h 2013-10-18 00:26:23.000000000 +0200 -+++ Mesa-9.2.2/src/gallium/include/pipe/p_config.h 2014-01-06 12:26:04.042469119 +0100 -@@ -126,7 +126,7 @@ +--- Mesa-10.1.0.orig/src/gallium/include/pipe/p_config.h 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/src/gallium/include/pipe/p_config.h 2014-03-14 21:36:14.000000000 +0100 +@@ -130,7 +130,7 @@ * Endian detection. */ diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c index 4ca3a2708..db87901d3 100644 --- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c +++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c @@ -1,6 +1,6 @@ ---- Mesa-9.2.2.orig/src/mesa/main/querymatrix.c 2013-04-08 20:21:04.000000000 +0200 -+++ Mesa-9.2.2/src/mesa/main/querymatrix.c 2013-10-24 17:06:31.000000000 +0200 -@@ -74,7 +74,7 @@ fpclassify(double x) +--- Mesa-10.1.0.orig/src/mesa/main/querymatrix.c 2014-02-27 02:56:40.000000000 +0100 ++++ Mesa-10.1.0/src/mesa/main/querymatrix.c 2014-03-14 21:36:14.000000000 +0100 +@@ -76,7 +76,7 @@ fpclassify(double x) #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index e766b685d..4e3a33c91 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server PKG_VERSION:= 1.15.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= faf04f1213f9a476997a774254b3abce PKG_DESCR:= Xorg server PKG_SECTION:= x11/server @@ -45,7 +45,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CPPFLAGS+= -D_GNU_SOURCE +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h new file mode 100644 index 000000000..3a0eb0dbb --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h @@ -0,0 +1,13 @@ +from alpinelinux + +--- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h 2013-12-15 08:48:09.000000000 +0100 ++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h 2014-03-14 23:25:52.000000000 +0100 +@@ -995,7 +995,7 @@ inl(unsigned short port) + return xf86ReadMmio32Le((void *) ioBase, port); + } + +-#elif defined(__arm__) && defined(__linux__) ++#elif defined(__arm__) && defined(__GLIBC__) + + /* for Linux on ARM, we use the LIBC inx/outx routines */ + /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h new file mode 100644 index 000000000..2fa3bed60 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h @@ -0,0 +1,16 @@ +--- xorg-server-1.15.0.orig/hw/xfree86/os-support/xf86_OSlib.h 2013-12-15 08:48:09.000000000 +0100 ++++ xorg-server-1.15.0/hw/xfree86/os-support/xf86_OSlib.h 2014-03-14 22:59:25.000000000 +0100 +@@ -177,12 +177,8 @@ + #include <stdlib.h> + #include <sys/types.h> + #include <assert.h> +- +-#ifdef __linux__ +-#include <termio.h> +-#else /* __GLIBC__ */ + #include <termios.h> +-#endif ++ + #ifdef __sparc__ + #include <sys/param.h> + #endif |