diff options
| -rw-r--r-- | Mk/bsd.sanity.mk | 4 | ||||
| -rw-r--r-- | graphics/libGL/Makefile | 7 | ||||
| -rw-r--r-- | graphics/libGL/Makefile.common | 11 | ||||
| -rw-r--r-- | graphics/libGL/distinfo | 5 | ||||
| -rw-r--r-- | graphics/libGL/files/configure.ac | 35 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-configure | 45 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-src__gallium__auxiliary__util__u_network.c | 12 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h | 13 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-src__mapi__entry_x86_tls.h | 13 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h | 13 | ||||
| -rw-r--r-- | graphics/libGL/pkg-plist | 2 |
11 files changed, 81 insertions, 79 deletions
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 913852be5b3..4c5bb3293f7 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -7,6 +7,10 @@ WARNING+= "WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead" .endif +.if defined(WITH_NEW_MESA) || defined(WITHOUT_NEW_MESA) +WARNING+= "WITH_NEW_MESA was removed and has no effect" +.endif + .if defined(WITH_NEW_XORG) || defined(WITHOUT_NEW_XORG) WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect" .endif diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 4874a0824da..184e3d96ea7 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \ - presentproto xshmfence + presentproto xshmfence xcb .include <bsd.port.options.mk> .include "${.CURDIR}/Makefile.common" @@ -27,7 +27,8 @@ post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa @${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \ ${STAGEDIR}${PREFIX}/lib/.mesa/ - @cd ${WRKSRC}/src/mesa && ${SETENV} DESTDIR=${STAGEDIR} \ - ${MAKE_CMD} install-pkgconfigDATA install-glHEADERS + @cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \ + ${MAKE_CMD} install-pkgconfigDATA install-glHEADERS \ + install-glxHEADERS .include <bsd.port.mk> diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common index e3d6e223bbe..cbf53c81921 100644 --- a/graphics/libGL/Makefile.common +++ b/graphics/libGL/Makefile.common @@ -18,7 +18,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 11.2.2 +MESABASEVERSION= 12.0.4 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= @@ -32,11 +32,10 @@ BUILD_DEPENDS+= makedepend:devel/makedepend LIB_DEPENDS+= libdevq.so:devel/libdevq USES+= compiler:c++11-lib bison gettext-tools gmake libtool \ - pathfix pkgconfig python:2,build shebangfix tar:xz + localbase pathfix pkgconfig python:2,build shebangfix tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= -isystem${LOCALBASE}/include -LDFLAGS+= -Wl,-Y/usr/lib:${LOCALBASE}/lib +LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall @@ -124,9 +123,9 @@ CONFIGURE_ARGS+= --disable-opencl CONFIGURE_ARGS+= --enable-osmesa # gallium -BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER} +BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.l_1:devel/llvm${MESA_LLVM_VER} .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != "" -RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER} +RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER} .endif CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index f814e02c748..946c82a4a2b 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,2 +1,3 @@ -SHA256 (mesa-11.2.2.tar.xz) = 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4 -SIZE (mesa-11.2.2.tar.xz) = 7860932 +TIMESTAMP = 1479220405 +SHA256 (mesa-12.0.4.tar.xz) = 5d6003da867d3f54e5000b4acdfc37e6cce5b6a4459274fdad73e24bd2f0065e +SIZE (mesa-12.0.4.tar.xz) = 8656864 diff --git a/graphics/libGL/files/configure.ac b/graphics/libGL/files/configure.ac index 5b9bf0a6cc4..a01f16b08eb 100644 --- a/graphics/libGL/files/configure.ac +++ b/graphics/libGL/files/configure.ac @@ -1,14 +1,14 @@ ---- configure.ac.orig 2015-12-21 10:05:52.000000000 +0100 -+++ configure.ac 2015-12-22 17:04:25.728359000 +0100 -@@ -78,6 +78,7 @@ +--- configure.ac.orig 2016-06-21 14:31:09.000000000 +0200 ++++ configure.ac 2016-07-08 13:05:53.236433000 +0200 +@@ -79,6 +79,7 @@ DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 +LIBDEVQ_REQUIRED=0.0.2 GLPROTO_REQUIRED=1.4.14 LIBOMXIL_BELLAGIO_REQUIRED=0.0 - LIBVA_REQUIRED=0.35.0 -@@ -743,7 +744,7 @@ + LIBVA_REQUIRED=0.38.0 +@@ -871,7 +872,7 @@ [enable_dri=yes]) case "$host_os" in @@ -17,7 +17,7 @@ dri3_default=yes ;; *) -@@ -1000,6 +1001,9 @@ +@@ -1311,6 +1312,9 @@ PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED], have_libudev=yes, have_libudev=no) @@ -27,7 +27,7 @@ AC_ARG_ENABLE([sysfs], [AS_HELP_STRING([--enable-sysfs], [enable /sys PCI identification @<:@default=disabled@:>@])], -@@ -1096,6 +1100,10 @@ +@@ -1408,6 +1412,10 @@ DEFINES="$DEFINES -DHAVE_LIBUDEV" have_pci_id=yes fi @@ -38,7 +38,7 @@ if test "$have_sysfs" = yes; then DEFINES="$DEFINES -DHAVE_SYSFS" -@@ -1228,6 +1236,23 @@ +@@ -1540,6 +1548,23 @@ ;; gnu*) DEFINES="$DEFINES -DHAVE_ALIAS" @@ -62,7 +62,7 @@ ;; cygwin*) if test "x$with_dri_drivers" = "xyes"; then -@@ -1384,6 +1409,8 @@ +@@ -1746,6 +1771,8 @@ AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes) if test "x$need_pci_id$have_libudev" = xyesyes; then GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" @@ -71,7 +71,7 @@ else GBM_PC_REQ_PRIV="" fi -@@ -1545,9 +1572,19 @@ +@@ -1921,9 +1948,19 @@ AC_MSG_ERROR([cannot enable OpenCL without Gallium]) fi @@ -91,7 +91,20 @@ if test "x$have_libclc" = xno; then AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover. -@@ -1815,8 +1852,6 @@ +@@ -2102,9 +2139,9 @@ + strip_unwanted_llvm_flags() { + # Use \> (marks the end of the word) + echo `$1` | sed \ +- -e 's/-march=\S*//g' \ +- -e 's/-mtune=\S*//g' \ +- -e 's/-mcpu=\S*//g' \ ++ -e 's/-march=[[:graph:]]* //g' \ ++ -e 's/-mtune=[[:graph:]]* //g' \ ++ -e 's/-mcpu=[[:graph:]]* //g' \ + -e 's/-DNDEBUG\>//g' \ + -e 's/-D_GNU_SOURCE\>//g' \ + -e 's/-pedantic\>//g' \ +@@ -2196,8 +2233,6 @@ CLANG_LIBDIR=${LLVM_LIBDIR} fi CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} diff --git a/graphics/libGL/files/patch-configure b/graphics/libGL/files/patch-configure index de767d34edf..fbb79655470 100644 --- a/graphics/libGL/files/patch-configure +++ b/graphics/libGL/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-12-22 17:04:20.271630000 +0100 -+++ configure 2015-12-22 17:05:17.669976000 +0100 -@@ -858,6 +858,8 @@ +--- configure.orig 2016-07-08 12:46:20.268123000 +0200 ++++ configure 2016-07-08 13:06:42.801841000 +0200 +@@ -867,6 +867,8 @@ GLPROTO_CFLAGS XLIBGL_LIBS XLIBGL_CFLAGS @@ -8,9 +8,9 @@ +LIBDEVQ_CFLAGS LIBUDEV_LIBS LIBUDEV_CFLAGS - MESA_LLVM -@@ -1156,6 +1158,8 @@ - LIBDRM_LIBS + ENABLE_SHADER_CACHE_FALSE +@@ -1200,6 +1202,8 @@ + OPENSSL_LIBS LIBUDEV_CFLAGS LIBUDEV_LIBS +LIBDEVQ_CFLAGS @@ -18,7 +18,7 @@ XLIBGL_CFLAGS XLIBGL_LIBS GLPROTO_CFLAGS -@@ -1966,6 +1970,10 @@ +@@ -2041,6 +2045,10 @@ C compiler flags for LIBUDEV, overriding pkg-config LIBUDEV_LIBS linker flags for LIBUDEV, overriding pkg-config @@ -29,15 +29,15 @@ XLIBGL_CFLAGS C compiler flags for XLIBGL, overriding pkg-config XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config -@@ -5246,6 +5254,7 @@ +@@ -5379,6 +5387,7 @@ DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 +LIBDEVQ_REQUIRED=0.0.2 GLPROTO_REQUIRED=1.4.14 LIBOMXIL_BELLAGIO_REQUIRED=0.0 - LIBVA_REQUIRED=0.35.0 -@@ -21035,7 +21044,7 @@ + LIBVA_REQUIRED=0.38.0 +@@ -21721,7 +21730,7 @@ case "$host_os" in @@ -46,7 +46,7 @@ dri3_default=yes ;; *) -@@ -21543,6 +21552,78 @@ +@@ -22849,6 +22858,78 @@ have_libudev=yes fi @@ -125,7 +125,7 @@ # Check whether --enable-sysfs was given. if test "${enable_sysfs+set}" = set; then : enableval=$enable_sysfs; have_sysfs="$enableval" -@@ -22258,6 +22339,10 @@ +@@ -23655,6 +23736,10 @@ DEFINES="$DEFINES -DHAVE_LIBUDEV" have_pci_id=yes fi @@ -136,7 +136,7 @@ if test "$have_sysfs" = yes; then DEFINES="$DEFINES -DHAVE_SYSFS" -@@ -22396,6 +22481,22 @@ +@@ -23793,6 +23878,22 @@ ;; gnu*) DEFINES="$DEFINES -DHAVE_ALIAS" @@ -159,7 +159,7 @@ ;; cygwin*) if test "x$with_dri_drivers" = "xyes"; then -@@ -23195,6 +23296,8 @@ +@@ -24646,6 +24747,8 @@ if test "x$need_pci_id$have_libudev" = xyesyes; then GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" @@ -168,7 +168,7 @@ else GBM_PC_REQ_PRIV="" fi -@@ -24018,9 +24121,19 @@ +@@ -25581,9 +25684,19 @@ as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5 fi @@ -188,7 +188,20 @@ if test "x$have_libclc" = xno; then as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover. -@@ -24835,9 +24948,6 @@ +@@ -26112,9 +26225,9 @@ + strip_unwanted_llvm_flags() { + # Use \> (marks the end of the word) + echo `$1` | sed \ +- -e 's/-march=\S*//g' \ +- -e 's/-mtune=\S*//g' \ +- -e 's/-mcpu=\S*//g' \ ++ -e 's/-march=[:graph:]* //g' \ ++ -e 's/-mtune=[:graph:]* //g' \ ++ -e 's/-mcpu=[:graph:]* //g' \ + -e 's/-DNDEBUG\>//g' \ + -e 's/-D_GNU_SOURCE\>//g' \ + -e 's/-pedantic\>//g' \ +@@ -26403,9 +26516,6 @@ CLANG_LIBDIR=${LLVM_LIBDIR} fi CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} diff --git a/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_network.c b/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_network.c new file mode 100644 index 00000000000..bad850468bd --- /dev/null +++ b/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_network.c @@ -0,0 +1,12 @@ +--- src/gallium/auxiliary/util/u_network.c.orig 2016-06-09 20:55:43.663754000 +0200 ++++ src/gallium/auxiliary/util/u_network.c 2016-06-09 20:57:58.602711000 +0200 +@@ -7,7 +7,8 @@ + # include <winsock2.h> + # include <windows.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_BSD) + # include <sys/socket.h> + # include <netinet/in.h> + # include <unistd.h> diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h b/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h deleted file mode 100644 index 32d4b0577c3..00000000000 --- a/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/mapi/entry_x86-64_tls.h.orig 2013-10-05 05:59:22.000000000 +0200 -+++ src/mapi/entry_x86-64_tls.h 2014-07-29 20:28:05.000000000 +0200 -@@ -63,8 +63,8 @@ entry_patch_public(void) - { - } - --static char --x86_64_entry_start[]; -+extern char -+x86_64_entry_start[] __attribute__((visibility("hidden"))); - - mapi_func - entry_get_public(int slot) diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h b/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h deleted file mode 100644 index 51f2839b1a0..00000000000 --- a/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/mapi/entry_x86_tls.h.orig 2013-10-05 05:59:22.000000000 +0200 -+++ src/mapi/entry_x86_tls.h 2014-07-29 20:28:05.000000000 +0200 -@@ -73,8 +73,8 @@ __asm__(".text"); - extern unsigned long - x86_current_tls(); - --static char x86_entry_start[]; --static char x86_entry_end[]; -+extern char x86_entry_start[] __attribute__((visibility("hidden"))); -+extern char x86_entry_end[] __attribute__((visibility("hidden"))); - - void - entry_patch_public(void) diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h b/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h deleted file mode 100644 index 0aceed57416..00000000000 --- a/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/mapi/entry_x86_tsd.h.orig 2013-10-05 05:59:22.000000000 +0200 -+++ src/mapi/entry_x86_tsd.h 2014-07-29 20:28:05.000000000 +0200 -@@ -60,8 +60,8 @@ __asm__(".balign 32\n" - #include <string.h> - #include "u_execmem.h" - --static const char x86_entry_start[]; --static const char x86_entry_end[]; -+extern const char x86_entry_start[] __attribute__((visibility("hidden"))); -+extern const char x86_entry_end[] __attribute__((visibility("hidden"))); - - void - entry_patch_public(void) diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index 153f4c2a699..14112ed4b4c 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -5,8 +5,6 @@ include/GL/glext.h include/GL/glx.h include/GL/glx_mangle.h include/GL/glxext.h -@comment include/GL/osmesa.h -include/GL/wglext.h lib/.mesa/libGL.so lib/.mesa/libGL.so.1 lib/.mesa/libGL.so.1.2.0 |