diff options
| -rw-r--r-- | groups/261.native_packages_x11.group | 11 | ||||
| -rw-r--r-- | patches/mesa-18.0.0.local.patch | 72 |
2 files changed, 1 insertions, 82 deletions
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index 50bf998f..291cee2c 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -6,7 +6,7 @@ NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " atk cairo fontconfig freetype freetype_pre gdk gtk2 gxemul harfbuzz imlib2 libcaca libfontenc libICE libpthread_stubs libSM libX11 libXau libXaw libXdamage libXdmcp libXext libXfixes libXfont2 libXft libXi libxkbfile -libXmu libXpm libXt libXtst libXcursor mesa pango pixman rdesktop rxvt_unicode +libXmu libXpm libXt libXtst libXcursor pango pixman rdesktop rxvt_unicode st util_macros xcb xcb_proto xcb_util xcb_util_image xcb_util_wm xcowsay xcalc xeyes xorgproto Xrender xterm xtrans xwd xwin")"; : ${PKG_ATK_DEPENDS:="glib"}; @@ -161,15 +161,6 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")"; : ${PKG_LIBXCURSOR_SHA256SUM:=77f96b9ad0a3c422cfa826afabaf1e02b9bfbfc8908c5fa1a45094faad074b98}; : ${PKG_LIBXCURSOR_VERSION:=1.2.1}; : ${PKG_LIBXCURSOR_URL:=https://www.x.org/releases/individual/lib/libXcursor-${PKG_LIBXCURSOR_VERSION}.tar.gz}; -: ${PKG_MESA_DEPENDS:="expat libpthread_stubs libX11 libXext libz xcb"}; -: ${PKG_MESA_SHA256SUM:=694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea}; -: ${PKG_MESA_VERSION:=18.0.0}; -: ${PKG_MESA_URL:=https://mesa.freedesktop.org/archive/mesa-${PKG_MESA_VERSION}.tar.xz}; -: ${PKG_MESA_CFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"}; -: ${PKG_MESA_CONFIGURE_ARGS_EXTRA:="--enable-glx=xlib --with-platforms=x11 --disable-dri --disable-gbm --disable-egl --with-gallium-drivers= --disable-llvm --disable-asm"}; -: ${PKG_MESA_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"}; -: ${PKG_MESA_LIBTOOL:=slibtool-shared}; -: ${PKG_MESA_DISABLED:=1}; : ${PKG_PANGO_DEPENDS:="cairo fontconfig harfbuzz"}; : ${PKG_PANGO_VERSION:=1.40.11}; : ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e}; diff --git a/patches/mesa-18.0.0.local.patch b/patches/mesa-18.0.0.local.patch deleted file mode 100644 index e5278bda..00000000 --- a/patches/mesa-18.0.0.local.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -ru mesa-18.0.0.orig/src/gallium/auxiliary/os/os_misc.c mesa-18.0.0/src/gallium/auxiliary/os/os_misc.c ---- mesa-18.0.0.orig/src/gallium/auxiliary/os/os_misc.c 2018-03-27 19:35:14.000000000 +0200 -+++ mesa-18.0.0/src/gallium/auxiliary/os/os_misc.c 2018-03-31 17:16:02.843416010 +0200 -@@ -47,7 +47,7 @@ - #endif - - --#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) -+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_MIDIPIX) - # include <unistd.h> - #elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD) - # include <sys/sysctl.h> -@@ -124,7 +124,7 @@ - bool - os_get_total_physical_memory(uint64_t *size) - { --#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) -+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_MIDIPIX) - const long phys_pages = sysconf(_SC_PHYS_PAGES); - const long page_size = sysconf(_SC_PAGE_SIZE); - -diff -ru mesa-18.0.0.orig/src/gallium/auxiliary/rtasm/rtasm_x86sse.h mesa-18.0.0/src/gallium/auxiliary/rtasm/rtasm_x86sse.h ---- mesa-18.0.0.orig/src/gallium/auxiliary/rtasm/rtasm_x86sse.h 2018-03-27 19:35:14.000000000 +0200 -+++ mesa-18.0.0/src/gallium/auxiliary/rtasm/rtasm_x86sse.h 2018-03-31 17:12:28.412711185 +0200 -@@ -140,7 +140,7 @@ - { - #ifdef PIPE_ARCH_X86 - return X86_32; --#elif (defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_WINDOWS)) && defined(PIPE_ARCH_X86_64) -+#elif (defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_WINDOWS) || defined(PIPE_OS_MIDIPIX)) && defined(PIPE_ARCH_X86_64) - return X86_64_WIN64_ABI; - #elif defined(PIPE_ARCH_X86_64) - return X86_64_STD_ABI; -diff -ru mesa-18.0.0.orig/src/gallium/auxiliary/util/u_network.c mesa-18.0.0/src/gallium/auxiliary/util/u_network.c ---- mesa-18.0.0.orig/src/gallium/auxiliary/util/u_network.c 2018-03-27 19:35:14.000000000 +0200 -+++ mesa-18.0.0/src/gallium/auxiliary/util/u_network.c 2018-03-31 17:14:07.064114855 +0200 -@@ -10,7 +10,7 @@ - # include <windows.h> - # include <ws2tcpip.h> - #elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \ -- defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) -+ defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_MIDIPIX) - # include <sys/socket.h> - # include <netinet/in.h> - # include <unistd.h> -diff -ru mesa-18.0.0.orig/src/gallium/include/pipe/p_config.h mesa-18.0.0/src/gallium/include/pipe/p_config.h ---- mesa-18.0.0.orig/src/gallium/include/pipe/p_config.h 2018-03-27 19:35:15.000000000 +0200 -+++ mesa-18.0.0/src/gallium/include/pipe/p_config.h 2018-03-31 17:16:40.779187231 +0200 -@@ -213,6 +213,11 @@ - #define PIPE_OS_UNIX - #endif - -+#if defined(__midipix__) -+#define PIPE_OS_MIDIPIX -+#define PIPE_OS_UNIX -+#endif -+ - /* - * Try to auto-detect the subsystem. - * -diff -ru mesa-18.0.0.orig/src/util/xmlconfig.c mesa-18.0.0/src/util/xmlconfig.c ---- mesa-18.0.0.orig/src/util/xmlconfig.c 2018-03-27 19:35:15.000000000 +0200 -+++ mesa-18.0.0/src/util/xmlconfig.c 2018-03-31 17:36:30.362136400 +0200 -@@ -40,7 +40,7 @@ - - #undef GET_PROGRAM_NAME - --#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__) -+#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__) || defined(__midipix__)) && !defined(__UCLIBC__) - # if !defined(__GLIBC__) || (__GLIBC__ < 2) - /* These aren't declared in any libc5 header */ - extern char *program_invocation_name, *program_invocation_short_name; |