Index: graphics/dri/pkg-plist =================================================================== --- graphics/dri/pkg-plist (revision 1507) +++ graphics/dri/pkg-plist (working copy) @@ -1,5 +1,6 @@ %%I965_DRIVER%%etc/drirc include/GL/internal/dri_interface.h +%%NEW%%%%GALLIUM%%lib/dri/kms_swrast_dri.so %%OLD%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so %%OLD%%%%I965_DRIVER%%lib/dri/i965_dri.la @@ -6,25 +7,36 @@ %%I965_DRIVER%%lib/dri/i965_dri.so %%OLD%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so -%%GALLIUM%%lib/dri/r300_dri.la -%%GALLIUM%%lib/dri/r300_dri.so -%%GALLIUM%%lib/dri/r600_dri.la -%%GALLIUM%%lib/dri/r600_dri.so +%%OLD%%%%GALLIUM%%lib/dri/r300_dri.la +%%OLD%%%%GALLIUM%%lib/dri/r300_dri.so +%%OLD%%%%GALLIUM%%lib/dri/r600_dri.la +%%OLD%%%%GALLIUM%%lib/dri/r600_dri.so %%OLD%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la -%%RADEON_DRIVER%%lib/dri/radeon_dri.so -%%GALLIUM%%lib/dri/radeonsi_dri.la -%%GALLIUM%%lib/dri/radeonsi_dri.so -%%GALLIUM%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la -%%SWRAST_DRIVER%%lib/dri/swrast_dri.so -%%GALLIUM%%lib/dri/vmwgfx_dri.la -%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%OLD%%%%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%OLD%%%%GALLIUM%%lib/dri/radeonsi_dri.la +%%OLD%%%%GALLIUM%%lib/dri/radeonsi_dri.so +%%OLD%%%%GALLIUM%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la +%%OLD%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.so +%%OLD%%%%GALLIUM%%lib/dri/vmwgfx_dri.la +%%OLD%%%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_r300.la +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_r300.so +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_r600.la +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_r600.so +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_radeonsi.la +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_radeonsi.so +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_swrast.la +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_swrast.so +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_vmwgfx.la +%%NEW%%%%GALLIUM%%lib/gallium-pipe/pipe_vmwgfx.so %%OLD%%%%GALLIUM%%lib/libXvMCr300.la %%OLD%%%%GALLIUM%%lib/libXvMCr300.so %%OLD%%%%GALLIUM%%lib/libXvMCr300.so.1 %%OLD%%%%GALLIUM%%lib/libXvMCr300.so.1.0.0 -%%GALLIUM%%lib/libXvMCr600.la +%%OLD%%%%GALLIUM%%lib/libXvMCr600.la %%GALLIUM%%lib/libXvMCr600.so %%GALLIUM%%lib/libXvMCr600.so.1 +%%GALLIUM%%lib/libXvMCr600.so.1.0 %%GALLIUM%%lib/libXvMCr600.so.1.0.0 %%OLD%%%%GALLIUM%%lib/libXvMCsoftpipe.la %%OLD%%%%GALLIUM%%lib/libXvMCsoftpipe.so @@ -38,13 +50,15 @@ %%OLD%%%%VDPAU%%lib/vdpau/libvdpau_r300.so %%OLD%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1 %%OLD%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0 -%%VDPAU%%lib/vdpau/libvdpau_r600.la +%%OLD%%%%VDPAU%%lib/vdpau/libvdpau_r600.la %%VDPAU%%lib/vdpau/libvdpau_r600.so %%VDPAU%%lib/vdpau/libvdpau_r600.so.1 +%%NEW%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0 %%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0 -%%VDPAU%%lib/vdpau/libvdpau_radeonsi.la +%%OLD%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.la %%VDPAU%%lib/vdpau/libvdpau_radeonsi.so %%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1 +%%NEW%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0 %%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 %%OLD%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.la %%OLD%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so @@ -52,6 +66,7 @@ %%OLD%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0 %%VDPAU%%libdata/pkgconfig/dri.pc %%VDPAU%%@dirrm lib/vdpau +@dirrm lib/gallium-pipe @dirrm lib/dri @dirrmtry include/GL/internal @dirrmtry include/GL Index: graphics/gbm/Makefile =================================================================== --- graphics/gbm/Makefile (revision 1507) +++ graphics/gbm/Makefile (working copy) @@ -25,6 +25,10 @@ .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" pre-build: - @cd ${WRKSRC}/src/mapi/shared-glapi && ${MAKE_CMD} +.if defined(WITH_NEW_MESA) + @cd ${WRKSRC}/src/mapi/ && ${MAKE_CMD} ${_MAKE_JOBS} +.else + @cd ${WRKSRC}/src/mapi/shared-glapi && ${MAKE_CMD} ${_MAKE_JOBS} +.endif .include Index: graphics/libEGL/pkg-plist =================================================================== --- graphics/libEGL/pkg-plist (revision 1507) +++ graphics/libEGL/pkg-plist (working copy) @@ -1,5 +1,6 @@ include/EGL/egl.h include/EGL/eglext.h +%%NEW%%include/EGL/eglextchromium.h include/EGL/eglmesaext.h include/EGL/eglplatform.h include/KHR/khrplatform.h Index: graphics/libGL/bsd.mesalib.mk =================================================================== --- graphics/libGL/bsd.mesalib.mk (revision 1507) +++ graphics/libGL/bsd.mesalib.mk (working copy) @@ -17,14 +17,18 @@ MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_MESA) -MESABASEVERSION= 10.2.4 +MESABASEVERSION= 10.3.0 # if there is a subversion, don't include the '-' between 7.11-rc2. -MESASUBVERSION= +MESASUBVERSION= rc3 +.if ${MESASUBVERSION} == "" MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ +.else +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION:R}/ +.endif PLIST_SUB+= OLD="@comment " NEW="" # work around libarchive bug? -EXTRACT_CMD=${LOCALBASE}/bin/gtar +EXTRACT_CMD= ${LOCALBASE}/bin/gtar EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar .else @@ -42,9 +46,8 @@ LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq -USES+= bison gmake libtool:keepla pathfix pkgconfig shebangfix \ - tar:bzip2 -USE_PYTHON_BUILD=2 +USES+= bison gmake libtool:keepla pathfix pkgconfig python:2,build \ + shebangfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -53,7 +56,7 @@ .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex -CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex +CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex .endif python_OLD_CMD= "/usr/bin/env[[:space:]]python" @@ -61,6 +64,7 @@ SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py + .if defined(WITH_NEW_MESA) SHEBANG_FILES+= src/mapi/mapi_abi.py .endif @@ -135,6 +139,7 @@ pre-mesa-build: .if defined(WITH_NEW_MESA) # do propper gmake target. + @cd ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool && ${MAKE_CMD} @cd ${WRKSRC}/src/loader && ${MAKE_CMD} libloader.la .endif Index: graphics/libGL/distinfo =================================================================== --- graphics/libGL/distinfo (revision 1507) +++ graphics/libGL/distinfo (working copy) @@ -1,2 +1,4 @@ -SHA256 (MesaLib-10.2.4.tar.bz2) = 06a2341244eb85c283f59f70161e06ded106f835ed9b6be1ef0243bd9344811a -SIZE (MesaLib-10.2.4.tar.bz2) = 7128555 +SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0 +SIZE (MesaLib-9.1.7.tar.bz2) = 6134393 +SHA256 (MesaLib-10.3.0-rc3.tar.bz2) = b67937ae9deb7daeb91d978747ec1a5e8ad98a401df9ef8ec4efee404340a2fb +SIZE (MesaLib-10.3.0-rc3.tar.bz2) = 7239803 Index: graphics/libGL/files/configure.ac =================================================================== --- graphics/libGL/files/configure.ac (revision 1507) +++ graphics/libGL/files/configure.ac (working copy) @@ -1,5 +1,5 @@ ---- configure.ac.orig 2014-05-17 08:38:43.000000000 +0200 -+++ configure.ac 2014-05-18 11:54:55.000000000 +0200 +--- configure.ac.orig 2014-08-21 01:41:38.000000000 +0200 ++++ configure.ac 2014-08-29 13:40:20.688548140 +0200 @@ -37,6 +37,7 @@ DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 @@ -18,7 +18,7 @@ AC_PROG_MKDIR_P @@ -152,7 +153,7 @@ - DEFINES="" + DEFINES="-DUSE_EXTERNAL_DXTN_LIB=1" AC_SUBST([DEFINES]) case "$host_os" in -linux*|*-gnu*|gnu*) @@ -26,7 +26,7 @@ DEFINES="$DEFINES -D_GNU_SOURCE -DHAVE_PTHREAD" ;; solaris*) -@@ -567,7 +568,7 @@ +@@ -581,7 +582,7 @@ [enable_dri=yes]) case "$host_os" in @@ -35,45 +35,30 @@ dri3_default=yes ;; *) -@@ -818,13 +819,23 @@ - - case "$host_os" in - linux*) -- need_libudev=yes ;; -+ need_libudev=yes -+ need_libdevq=no -+ ;; -+freebsd*) -+ need_libdevq=yes -+ need_libudev=no -+ ;; - *) -- need_libudev=no ;; -+ need_libdevq=no -+ need_libudev=no -+ ;; - esac - +@@ -855,6 +856,9 @@ PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED], have_libudev=yes, have_libudev=no) + +PKG_CHECK_MODULES([LIBDEVQ], [libdevq-1.0 >= $LIBDEVQ_REQUIRED], + have_libdevq=yes, have_libdevq=no) - - if test "x$enable_dri" = xyes; then - if test "$enable_static" = yes; then -@@ -913,6 +924,9 @@ - if test "$have_libudev" = yes; then ++ + AC_ARG_ENABLE([sysfs], + [AS_HELP_STRING([--enable-sysfs], + [enable /sys PCI identification @<:@default=disabled@:>@])], +@@ -949,6 +953,10 @@ DEFINES="$DEFINES -DHAVE_LIBUDEV" + have_pci_id=yes fi +if test "$have_libdevq" = yes; then + DEFINES="$DEFINES -DHAVE_LIBDEVQ" ++ have_pci_id=yes +fi - # This is outside the case (above) so that it is invoked even for non-GLX - # builds. -@@ -1029,6 +1043,23 @@ + if test "$have_sysfs" = yes; then + DEFINES="$DEFINES -DHAVE_SYSFS" +@@ -1069,6 +1077,23 @@ *freebsd* | dragonfly* | *netbsd* | openbsd*) - DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DHAVE_PTHREAD" DEFINES="$DEFINES -DHAVE_ALIAS" +dnl not sure about dri3 support, just enable it for now. + if test "x$enable_dri3" = xyes; then @@ -94,17 +79,17 @@ + esac ;; gnu*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" -@@ -1204,6 +1235,8 @@ + DEFINES="$DEFINES -DHAVE_ALIAS" +@@ -1252,6 +1277,8 @@ AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes) - if test "x$need_libudev" = xyes; then + if test "x$need_pci_id$have_libudev" = xyesyes; then GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" +elif test "x$need_libdevq" = xyes; then -+ GBM_PC_REQ_PRIV="libdevq >= $LIBDEVQ_REQUIRED" ++ GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED" else GBM_PC_REQ_PRIV="" fi -@@ -1662,8 +1695,6 @@ +@@ -1728,8 +1755,6 @@ CLANG_LIBDIR=${LLVM_LIBDIR} fi CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} Index: graphics/libGL/files/patch-configure =================================================================== --- graphics/libGL/files/patch-configure (revision 1507) +++ graphics/libGL/files/patch-configure (working copy) @@ -1,6 +1,6 @@ ---- configure.orig 2014-05-18 12:07:50.000000000 +0200 -+++ configure 2014-05-18 12:08:18.000000000 +0200 -@@ -850,6 +850,8 @@ +--- configure.orig 2014-08-29 13:42:21.635540273 +0200 ++++ configure 2014-08-29 13:42:55.401537200 +0200 +@@ -858,6 +858,8 @@ GLPROTO_CFLAGS XLIBGL_LIBS XLIBGL_CFLAGS @@ -9,7 +9,7 @@ LIBUDEV_LIBS LIBUDEV_CFLAGS LIBDRM_LIBS -@@ -1130,6 +1132,8 @@ +@@ -1146,6 +1148,8 @@ LIBDRM_LIBS LIBUDEV_CFLAGS LIBUDEV_LIBS @@ -18,7 +18,7 @@ XLIBGL_CFLAGS XLIBGL_LIBS GLPROTO_CFLAGS -@@ -1930,6 +1934,10 @@ +@@ -1945,6 +1949,10 @@ C compiler flags for LIBUDEV, overriding pkg-config LIBUDEV_LIBS linker flags for LIBUDEV, overriding pkg-config @@ -29,7 +29,7 @@ XLIBGL_CFLAGS C compiler flags for XLIBGL, overriding pkg-config XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config -@@ -5071,6 +5079,7 @@ +@@ -5086,6 +5094,7 @@ DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 @@ -37,7 +37,7 @@ GLPROTO_REQUIRED=1.4.14 LIBOMXIL_BELLAGIO_REQUIRED=0.0 VDPAU_REQUIRED=0.4.1 -@@ -6504,7 +6513,7 @@ +@@ -6519,7 +6528,7 @@ test -n "$MAKE" && break done @@ -46,8 +46,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -17876,7 +17885,7 @@ - DEFINES="" +@@ -17891,7 +17900,7 @@ + DEFINES="-DUSE_EXTERNAL_DXTN_LIB=1" case "$host_os" in -linux*|*-gnu*|gnu*) @@ -55,7 +55,7 @@ DEFINES="$DEFINES -D_GNU_SOURCE -DHAVE_PTHREAD" ;; solaris*) -@@ -19098,7 +19107,7 @@ +@@ -19147,7 +19156,7 @@ case "$host_os" in @@ -64,30 +64,11 @@ dri3_default=yes ;; *) -@@ -19507,9 +19516,17 @@ - - case "$host_os" in - linux*) -- need_libudev=yes ;; -+ need_libudev=yes -+ need_libdevq=no -+ ;; -+freebsd*) -+ need_libdevq=yes -+ need_libudev=no -+ ;; - *) -- need_libudev=no ;; -+ need_libdevq=no -+ need_libudev=no -+ ;; - esac - - -@@ -19584,6 +19601,77 @@ +@@ -19669,6 +19678,78 @@ have_libudev=yes fi ++ +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 +$as_echo_n "checking for LIBDEVQ... " >&6; } @@ -159,22 +140,23 @@ + have_libdevq=yes +fi + - if test "x$enable_dri" = xyes; then - if test "$enable_static" = yes; then - as_fn_error $? "Cannot use static libraries for DRI drivers" "$LINENO" 5 -@@ -20276,6 +20364,9 @@ - if test "$have_libudev" = yes; then + # Check whether --enable-sysfs was given. + if test "${enable_sysfs+set}" = set; then : + enableval=$enable_sysfs; have_sysfs="$enableval" +@@ -20373,6 +20454,10 @@ DEFINES="$DEFINES -DHAVE_LIBUDEV" + have_pci_id=yes fi +if test "$have_libdevq" = yes; then + DEFINES="$DEFINES -DHAVE_LIBDEVQ" ++ have_pci_id=yes +fi - # This is outside the case (above) so that it is invoked even for non-GLX - # builds. -@@ -20397,6 +20488,22 @@ + if test "$have_sysfs" = yes; then + DEFINES="$DEFINES -DHAVE_SYSFS" +@@ -20498,6 +20583,22 @@ *freebsd* | dragonfly* | *netbsd* | openbsd*) - DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DHAVE_PTHREAD" DEFINES="$DEFINES -DHAVE_ALIAS" + if test "x$enable_dri3" = xyes; then + DEFINES="$DEFINES -DHAVE_DRI3" @@ -194,17 +176,17 @@ + esac ;; gnu*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" -@@ -21117,6 +21224,8 @@ + DEFINES="$DEFINES -DHAVE_ALIAS" +@@ -21226,6 +21327,8 @@ - if test "x$need_libudev" = xyes; then + if test "x$need_pci_id$have_libudev" = xyesyes; then GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" +elif test "x$need_libdevq" = xyes; then -+ GBM_PC_REQ_PRIV="libdevq >= $LIBDEVQ_REQUIRED" ++ GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED" else GBM_PC_REQ_PRIV="" fi -@@ -22414,9 +22523,6 @@ +@@ -22541,9 +22644,6 @@ CLANG_LIBDIR=${LLVM_LIBDIR} fi CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} Index: graphics/libGL/files/patch-src__loader__Makefile.in =================================================================== --- graphics/libGL/files/patch-src__loader__Makefile.in (revision 1507) +++ graphics/libGL/files/patch-src__loader__Makefile.in (working copy) @@ -1,6 +1,6 @@ ---- src/loader/Makefile.in.orig 2014-07-24 21:30:20.000000000 +0200 -+++ src/loader//Makefile.in 2014-07-24 21:31:45.000000000 +0200 -@@ -291,6 +291,8 @@ +--- 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@ @@ -9,14 +9,12 @@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ -@@ -460,8 +462,8 @@ - +@@ -485,7 +487,7 @@ noinst_LTLIBRARIES = libloader.la libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \ -- $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) $(am__append_1) \ -- $(am__append_2) -+ $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBDEVQ_CFLAGS) \ -+ $(am__append_1) $(am__append_2) - @HAVE_LIBDRM_TRUE@libloader_la_LIBADD = \ - @HAVE_LIBDRM_TRUE@ $(LIBDRM_LIBS) - + -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) + libloader_la_SOURCES = $(LOADER_C_FILES) $(am__append_2) + libloader_la_LIBADD = $(am__append_3) $(am__append_6) + all: all-am Index: graphics/libGL/files/patch-src__loader__loader.c =================================================================== --- graphics/libGL/files/patch-src__loader__loader.c (revision 1507) +++ graphics/libGL/files/patch-src__loader__loader.c (working copy) @@ -1,5 +1,5 @@ ---- src/loader/loader.c.orig 2014-04-27 03:37:31.000000000 +0200 -+++ src/loader/loader.c 2014-05-18 12:50:44.000000000 +0200 +--- src/loader/loader.c.orig 2014-08-21 01:27:47.000000000 +0200 ++++ src/loader/loader.c 2014-09-04 19:57:56.384142575 +0200 @@ -67,7 +67,7 @@ #include #include @@ -8,12 +8,12 @@ +#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ) #include #include + #include +@@ -488,6 +488,53 @@ + } #endif -@@ -202,6 +202,51 @@ - return (*chip_id >= 0); - } -+#elif defined(HAVE_LIBDEVQ) ++#if defined(HAVE_LIBDEVQ) +#include + +static void *devq_handle = NULL; @@ -39,8 +39,8 @@ +#define DEVQ_SYMBOL(ret, name, args) \ + ret (*name) args = asserted_dlsym(devq_dlopen_handle(), #name); + -+int -+loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) ++static int ++devq_get_pci_id_from_fd(int fd, int *vendor_id, int *chip_id) +{ + int ret; + DEVQ_SYMBOL(int, devq_device_get_pciid_from_fd, @@ -58,6 +58,33 @@ + return (*chip_id >= 0); +} + - #elif !defined(__NOT_HAVE_DRM_H) ++#endif ++ + #if !defined(__NOT_HAVE_DRM_H) + /* for i915 */ + #include +@@ -571,6 +618,10 @@ + if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id)) + return 1; + #endif ++#if HAVE_LIBDEVQ ++ if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id)) ++ return 1; ++#endif + #if !defined(__NOT_HAVE_DRM_H) + if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id)) + return 1; +@@ -665,6 +716,13 @@ + if ((result = sysfs_get_device_name_for_fd(fd))) + return result; + #endif ++#if HAVE_LIBDEVQ ++#if 0 ++/* XXX implement this function in libdevq */ ++ if ((result = devq_device_get_name_for_fd(fd))) ++ return result; ++#endif ++#endif + return result; + } - /* for i915 */ Index: graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py =================================================================== --- graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py (revision 1507) +++ graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py (working copy) @@ -1,11 +1,11 @@ ---- ./src/mapi/glapi/gen/gl_gentable.py.orig 2014-02-23 22:01:50.000000000 +0100 -+++ ./src/mapi/glapi/gen/gl_gentable.py 2014-02-23 22:01:50.000000000 +0100 +--- src/mapi/glapi/gen/gl_gentable.py.orig 2014-08-31 01:21:41.368693630 +0200 ++++ src/mapi/glapi/gen/gl_gentable.py 2014-08-31 01:23:09.451686631 +0200 @@ -42,7 +42,7 @@ #endif #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ -- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__)) -+ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)) +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)) #define USE_BACKTRACE #endif Index: graphics/libGL/pkg-plist =================================================================== --- graphics/libGL/pkg-plist (revision 1507) +++ graphics/libGL/pkg-plist (working copy) @@ -1,5 +1,6 @@ include/GL/gl.h include/GL/gl_mangle.h +%%NEW%%include/GL/glcorearb.h include/GL/glext.h include/GL/glx.h include/GL/glx_mangle.h Index: graphics/libglesv2/Makefile =================================================================== --- graphics/libglesv2/Makefile (revision 1507) +++ graphics/libglesv2/Makefile (working copy) @@ -15,13 +15,18 @@ USE_XORG+= glproto dri2proto dri3proto xext xdamage xfixes presentproto \ xshmfence -BUILD_WKRSRC= ${WRKSRC}/src/mapi/es2api -INSTALL_WRKSRC= ${WRKSRC}/src/mapi/es2api +BUILD_WKRSRC= ${WRKSRC}/src/mapi +INSTALL_WRKSRC= ${WRKSRC}/src/mapi .include .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.if !defined(WITH_NEW_MESA) pre-build: - @cd ${WRKSRC}/src/mapi/shared-glapi && ${MAKE_CMD} + @cd ${WRKSRC}/src/mapi/shared-glapi && ${MAKE_CMD} ${_MAKE_JOBS} +.else +post-install: + @${RM} ${STAGEDIR}/${PREFIX}/lib/libglapi* +.endif .include