diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index a2144cf..6aee066 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -30,34 +30,37 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_MESA) -MESABASEVERSION= 10.4.6 +MESABASEVERSION= 10.5.0 # if there is a subversion, don't include the '-' between 7.11-rc2. -MESASUBVERSION= +MESASUBVERSION= MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ PLIST_SUB+= OLD="@comment " NEW="" -# work around libarchive bug? -EXTRACT_CMD= ${LOCALBASE}/bin/gtar -EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar +USES+= tar:xz +DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} + +BUILD_DEPENDS+= py27-mako>=0:${PORTSDIR}/textproc/py-mako .else MESABASEVERSION= 9.1.7 MESASUBVERSION= MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/older-versions/${MESABASEVERSION:R:R}.x/${MESABASEVERSION}/ PLIST_SUB+= OLD="" NEW="@comment " -.endif + +BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 +USES+= bison python:2,build tar:bzip2 DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} +.endif + MAINTAINER= x11@FreeBSD.org -BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ - ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 +BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq -USES+= bison gettext-tools gmake libtool pathfix pkgconfig \ - python:2,build shebangfix tar:bzip2 +USES+= gettext-tools gmake libtool pathfix pkgconfig shebangfix USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -67,7 +70,7 @@ LDFLAGS+= -Wl,-Y${LOCALBASE}/lib PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall -.if ${OSVERSION} < 1000033 +.if ${OSVERSION} < 1000033 && !defined(WITH_NEW_MESA) BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex .endif @@ -86,12 +89,13 @@ MASTERDIR= ${.CURDIR}/../../graphics/libGL .if defined(WITH_NEW_MESA) PATCHDIR= ${MASTERDIR}/files CONFIGURE_ARGS+= --disable-dri3 +WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} .else PATCHDIR= ${MASTERDIR}/files-old +WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION} .endif DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION} INSTALL_TARGET= install-strip COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index d0a11ec2..e92cd86 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,4 +1,4 @@ SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0 SIZE (MesaLib-9.1.7.tar.bz2) = 6134393 -SHA256 (MesaLib-10.4.6.tar.bz2) = d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 -SIZE (MesaLib-10.4.6.tar.bz2) = 7520024 +SHA256 (mesa-10.5.0.tar.xz) = d7ca9f9044bbdd674377e3eebceef1fae339c8817b9aa435c2053e4fea44e5d3 +SIZE (mesa-10.5.0.tar.xz) = 6974540 diff --git a/graphics/libGL/files/configure.ac-mako b/graphics/libGL/files/configure.ac-mako new file mode 100644 index 0000000..f070d4b --- /dev/null +++ b/graphics/libGL/files/configure.ac-mako @@ -0,0 +1,62 @@ +From ced9425327be6cb557a4a1217a1dac29b18d1a09 Mon Sep 17 00:00:00 2001 +From: Samuel Iglesias Gonsalvez +Date: Mon, 2 Mar 2015 10:49:31 +0100 +Subject: configure: Introduce new output variable to + ax_check_python_mako_module.m4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This output variables gives more flexibility for future changes +in autoconf to detect if it is needed to auto-generate files and +check for the auto-generation dependencies. + +It is still returning error when Python is not installed. + +Signed-off-by: Samuel Iglesias Gonsalvez +Reviewed-by: Kai Wasserbäch + +diff --git a/configure.ac b/configure.ac +index ad64df0..90c7737 100644 +--- configure.ac ++++ configure.ac +@@ -79,6 +79,7 @@ XCBDRI2_REQUIRED=1.8 + XCBGLX_REQUIRED=1.8.1 + XSHMFENCE_REQUIRED=1.1 + XVMC_REQUIRED=1.0.6 ++PYTHON_MAKO_REQUIRED=0.3.4 + + dnl Check for progs + AC_PROG_CPP +@@ -114,7 +115,12 @@ if test "x$INDENT" != "xcat"; then + fi + fi + +-AX_CHECK_PYTHON_MAKO_MODULE(0.3.4) ++AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED) ++if test -n "$PYTHON2" -a "x$acv_mako_found" = "xyes"; then ++ AC_MSG_RESULT(yes) ++else ++ AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found]) ++fi + + AC_PROG_INSTALL + +diff --git a/m4/ax_check_python_mako_module.m4 b/m4/ax_check_python_mako_module.m4 +index 2fc029b..ee68a7c 100644 +--- m4/ax_check_python_mako_module.m4 ++++ m4/ax_check_python_mako_module.m4 +@@ -54,8 +54,8 @@ else: + " | $PYTHON2 - + + if test $? -ne 0 ; then +- AC_MSG_ERROR(mako $1 or later is required.) ++ AC_SUBST(acv_mako_found, 'no') + else +- AC_MSG_RESULT(yes) ++ AC_SUBST(acv_mako_found, 'yes') + fi + ]) +-- +cgit v0.10.2 + diff --git a/graphics/libGL/files/patch-configure b/graphics/libGL/files/patch-configure index 1b2bb21..a7b9a67 100644 --- a/graphics/libGL/files/patch-configure +++ b/graphics/libGL/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-11-21 12:54:55.273970976 +0100 -+++ configure 2014-11-21 12:55:25.070967392 +0100 -@@ -853,6 +853,8 @@ +--- configure.orig 2015-03-08 20:45:36.420090000 +0100 ++++ configure 2015-03-08 20:46:12.639617000 +0100 +@@ -863,6 +863,8 @@ GLPROTO_CFLAGS XLIBGL_LIBS XLIBGL_CFLAGS @@ -9,7 +9,15 @@ LIBUDEV_LIBS LIBUDEV_CFLAGS LIBDRM_LIBS -@@ -1143,6 +1145,8 @@ +@@ -933,6 +935,7 @@ + GEN_ASM_OFFSETS_FALSE + GEN_ASM_OFFSETS_TRUE + POSIX_SHELL ++acv_mako_found + INDENT_FLAGS + INDENT + LEXLIB +@@ -1171,6 +1174,8 @@ LIBDRM_LIBS LIBUDEV_CFLAGS LIBUDEV_LIBS @@ -18,7 +26,7 @@ XLIBGL_CFLAGS XLIBGL_LIBS GLPROTO_CFLAGS -@@ -1942,6 +1946,10 @@ +@@ -1990,6 +1995,10 @@ C compiler flags for LIBUDEV, overriding pkg-config LIBUDEV_LIBS linker flags for LIBUDEV, overriding pkg-config @@ -29,15 +37,23 @@ XLIBGL_CFLAGS C compiler flags for XLIBGL, overriding pkg-config XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config -@@ -5085,6 +5093,7 @@ +@@ -5256,6 +5265,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 - VDPAU_REQUIRED=0.4.1 -@@ -6503,7 +6512,7 @@ + LIBVA_REQUIRED=0.35.0 +@@ -5266,6 +5276,7 @@ + XCBGLX_REQUIRED=1.8.1 + XSHMFENCE_REQUIRED=1.1 + XVMC_REQUIRED=1.0.6 ++PYTHON_MAKO_REQUIRED=0.3.4 + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -6675,7 +6686,7 @@ fi @@ -46,7 +62,37 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -20025,7 +20034,7 @@ +@@ -18476,18 +18487,25 @@ + except ImportError as err: + sys.exit(err) + else: +- ver_req = map(int, '0.3.4'.split('.')) ++ ver_req = map(int, '$PYTHON_MAKO_REQUIRED'.split('.')) + ver_act = map(int, mako.__version__.split('.')) + sys.exit(int(ver_req > ver_act)) + " | $PYTHON2 - + + if test $? -ne 0 ; then +- as_fn_error $? "mako 0.3.4 or later is required." "$LINENO" 5 ++ acv_mako_found='no' ++ + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } ++ acv_mako_found='yes' ++ + fi + ++if test -n "$PYTHON2" -a "x$acv_mako_found" = "xyes"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ as_fn_error $? "Python mako module v$PYTHON_MAKO_REQUIRED or higher not found" "$LINENO" 5 ++fi + + + +@@ -20724,7 +20742,7 @@ case "$host_os" in @@ -55,7 +101,7 @@ dri3_default=yes ;; *) -@@ -20543,6 +20552,78 @@ +@@ -21710,6 +21728,78 @@ have_libudev=yes fi @@ -134,7 +180,7 @@ # Check whether --enable-sysfs was given. if test "${enable_sysfs+set}" = set; then : enableval=$enable_sysfs; have_sysfs="$enableval" -@@ -21258,6 +21339,10 @@ +@@ -22425,6 +22515,10 @@ DEFINES="$DEFINES -DHAVE_LIBUDEV" have_pci_id=yes fi @@ -145,7 +191,7 @@ if test "$have_sysfs" = yes; then DEFINES="$DEFINES -DHAVE_SYSFS" -@@ -21385,6 +21470,22 @@ +@@ -22552,6 +22646,22 @@ ;; gnu*) DEFINES="$DEFINES -DHAVE_ALIAS" @@ -168,7 +214,7 @@ ;; cygwin*) if test "x$with_dri_drivers" = "xyes"; then -@@ -22205,6 +22306,8 @@ +@@ -23372,6 +23482,8 @@ if test "x$need_pci_id$have_libudev" = xyesyes; then GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" @@ -177,7 +223,7 @@ else GBM_PC_REQ_PRIV="" fi -@@ -23628,9 +23731,6 @@ +@@ -24993,9 +25105,6 @@ CLANG_LIBDIR=${LLVM_LIBDIR} fi CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} diff --git a/graphics/libGL/files/patch-src__loader__Makefile.in b/graphics/libGL/files/patch-src__loader__Makefile.in index 94068d3..b6c4863 100644 --- a/graphics/libGL/files/patch-src__loader__Makefile.in +++ b/graphics/libGL/files/patch-src__loader__Makefile.in @@ -1,20 +1,12 @@ ---- src/loader/Makefile.in.orig 2014-08-29 13:44:57.595529080 +0200 -+++ src/loader/Makefile.in 2014-08-29 13:46:36.674521667 +0200 -@@ -315,6 +315,8 @@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ - LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@ - LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@ -+LIBDEVQ_CFLAGS = @LIBDEVQ_CFLAGS@ -+LIBDEVQ_LIBS = @LIBDEVQ_LIBS@ - LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ - LIBDRM_LIBS = @LIBDRM_LIBS@ - LIBOBJS = @LIBOBJS@ -@@ -485,7 +487,7 @@ +--- src/loader/Makefile.in.orig 2015-02-13 11:43:48.742042000 +0100 ++++ src/loader/Makefile.in 2015-02-13 11:44:16.268221000 +0100 +@@ -521,7 +521,8 @@ noinst_LTLIBRARIES = libloader.la libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \ -I$(top_srcdir)/src $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) \ - $(am__append_1) $(am__append_4) $(am__append_5) -+ $(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_4) $(am__append_5) ++ $(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_4) \ ++ $(am__append_5) libloader_la_SOURCES = $(LOADER_C_FILES) $(am__append_2) libloader_la_LIBADD = $(am__append_3) $(am__append_6) all: all-am diff --git a/graphics/libGL/files/patch-src__mesa__drivers__common__meta_tex_subimage.c b/graphics/libGL/files/patch-src__mesa__drivers__common__meta_tex_subimage.c new file mode 100644 index 0000000..c43e0df --- /dev/null +++ b/graphics/libGL/files/patch-src__mesa__drivers__common__meta_tex_subimage.c @@ -0,0 +1,45 @@ +From 53d66c0c7c39fbe2a587a849e0714d6f9a01f476 Mon Sep 17 00:00:00 2001 +From: Jason Ekstrand +Date: Fri, 27 Feb 2015 12:29:03 -0800 +Subject: meta/TexSubImage: Stash everything other than PIXEL_TRANSFER/store in + meta_begin + +Previously, there were bugs where if the app set a scissor it could affect +the area of the texture that was downloaded. There was also potential that +the framebuffer SRGB state could affect downloads. This ensures that those +will get saved/restored and can't affect the texture download. + +Cc: 10.5 +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89292 +Reviewed-by: Neil Roberts +(cherry picked from commit b1ab02d9c0cc11ba8ef4efaba9452d644b6a0811) + +diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c +index ffbbacd..9f0c115 100644 +--- src/mesa/drivers/common/meta_tex_subimage.c ++++ src/mesa/drivers/common/meta_tex_subimage.c +@@ -183,8 +183,8 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, + if (allocate_storage) + ctx->Driver.AllocTextureImageBuffer(ctx, tex_image); + +- /* Only stash the current FBO */ +- _mesa_meta_begin(ctx, 0); ++ _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER | ++ MESA_META_PIXEL_STORE)); + + _mesa_GenFramebuffers(2, fbos); + _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]); +@@ -304,8 +304,8 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims, + if (!pbo_tex_image) + return false; + +- /* Only stash the current FBO */ +- _mesa_meta_begin(ctx, 0); ++ _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER | ++ MESA_META_PIXEL_STORE)); + + _mesa_GenFramebuffers(2, fbos); + +-- +cgit v0.10.2 + diff --git a/graphics/libGL/files/src__loader__Makefile.am b/graphics/libGL/files/src__loader__Makefile.am index 3739f42..7f752bf 100644 --- a/graphics/libGL/files/src__loader__Makefile.am +++ b/graphics/libGL/files/src__loader__Makefile.am @@ -1,12 +1,12 @@ ---- ./src/loader/Makefile.am.orig 2014-02-05 21:59:10.000000000 +0100 -+++ ./src/loader/Makefile.am 2014-02-23 22:01:50.000000000 +0100 -@@ -27,7 +27,8 @@ - $(DEFINES) \ +--- src/loader/Makefile.am.orig 2015-02-13 11:41:50.497483000 +0100 ++++ src/loader/Makefile.am 2015-02-13 11:42:02.748812000 +0100 +@@ -30,7 +30,8 @@ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ $(VISIBILITY_CFLAGS) \ - $(LIBUDEV_CFLAGS) + $(LIBUDEV_CFLAGS) \ + $(LIBDEVQ_CFLAGS) - if !HAVE_LIBDRM - libloader_la_CPPFLAGS += \ + libloader_la_SOURCES = $(LOADER_C_FILES) + libloader_la_LIBADD =