[Midnightbsd-cvs] mports [24044] trunk/graphics: update mesa ports
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 31 15:01:45 EDT 2018
Revision: 24044
http://svnweb.midnightbsd.org/mports/?rev=24044
Author: laffer1
Date: 2018-08-31 15:01:44 -0400 (Fri, 31 Aug 2018)
Log Message:
-----------
update mesa ports
Modified Paths:
--------------
trunk/graphics/Makefile
trunk/graphics/dri/Makefile
trunk/graphics/dri/pkg-plist
trunk/graphics/libEGL/Makefile
trunk/graphics/libEGL/pkg-descr
trunk/graphics/libEGL/pkg-plist
trunk/graphics/libGL/Makefile
trunk/graphics/libGL/distinfo
trunk/graphics/libGL/files/configure.ac
trunk/graphics/libGL/files/patch-configure
trunk/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h
trunk/graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp
trunk/graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c
trunk/graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py
trunk/graphics/libGL/files/patch-src__mesa__main__compiler.h
trunk/graphics/libGL/pkg-plist
trunk/graphics/libglapi/Makefile
trunk/graphics/libglapi/pkg-descr
Added Paths:
-----------
trunk/graphics/gbm/
trunk/graphics/gbm/Makefile
trunk/graphics/gbm/pkg-descr
trunk/graphics/gbm/pkg-plist
trunk/graphics/libGL/Makefile.common
trunk/graphics/libGL/Makefile.targets
trunk/graphics/libGL/files/patch-include__GL__internal__dri_interface.h
trunk/graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c
trunk/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c
trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
trunk/graphics/libGL/files/patch-src_intel_tools_aubinator.c
trunk/graphics/libGL/files/patch-src_util_ralloc.c
trunk/graphics/libGL/files/patch-src_util_u__endian.h
Removed Paths:
-------------
trunk/graphics/dri/pkg-plist-old
trunk/graphics/libEGL/pkg-deinstall
trunk/graphics/libEGL/pkg-install
trunk/graphics/libGL/bsd.mesalib.mk
trunk/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c
trunk/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c
trunk/graphics/libGL/files/patch-src__glsl__ir_constant_expression.cpp
trunk/graphics/libGL/files/patch-src__loader__Makefile.in
trunk/graphics/libGL/files/patch-src__loader__loader.c
trunk/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h
trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h
trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h
trunk/graphics/libGL/files-old/
trunk/graphics/libGL/pkg-deinstall
trunk/graphics/libGL/pkg-install
Modified: trunk/graphics/Makefile
===================================================================
--- trunk/graphics/Makefile 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/Makefile 2018-08-31 19:01:44 UTC (rev 24044)
@@ -34,6 +34,7 @@
SUBDIR += fortytwo
SUBDIR += freeglut
SUBDIR += frei0r
+SUBDIR += gbm
SUBDIR += gd
SUBDIR += gdchart
SUBDIR += gdk-pixbuf
Modified: trunk/graphics/dri/Makefile
===================================================================
--- trunk/graphics/dri/Makefile 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/dri/Makefile 2018-08-31 19:01:44 UTC (rev 24044)
@@ -2,24 +2,23 @@
PORTNAME= dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${DRIREVISION}
PORTEPOCH= 2
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for the DRI
+
LICENSE= mit
-LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \
- libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libdrm.so:graphics/libdrm \
+ libexpat.so:textproc/expat2
-USES+= pkgconfig
-USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto \
- presentproto xvmc xshmfence
+USES= ssl
+USE_XORG= dri2proto dri3proto glproto presentproto x11 xext xdamage \
+ xfixes xshmfence xv xvmc xxf86vm
-OPTIONS_DEFINE= TEXTURE GALLIUM
-OPTIONS_DEFAULT=TEXTURE GALLIUM
+OPTIONS_DEFINE= TEXTURE
+OPTIONS_DEFAULT=TEXTURE
-GALLIUM_DESC= Gallium (llvm backed) dri drivers
TEXTURE_DESC= Enable texture-float support (patent encumbered)
VDPAU_DESC= VDPAU (GPU video acceleration) support (needs Gallium)
@@ -27,68 +26,15 @@
.include <bsd.mport.options.mk>
-# gcc from base can't handle some code in mesa 9.1+
-# This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
-USE_GCC=yes
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
-ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
+#src/mesa/libmesagallium.la
+#MESA_BUILD_WRKSRC= src/util src/gallium
+#MESA_INSTALL_WRKSRC= src/gallium
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
-PLIST_SUB+= VERSION=${MESADISTVERSION}
+post-install:
+ @${RM} -r ${FAKE_DESTDIR}/etc/OpenCL
-DRI_DRIVERS= ${ALL_DRI_DRIVERS}
-
-.if defined(WITH_NEW_MESA)
-DRIREVISION= 0
-PLIST= ${.CURDIR}/pkg-plist
-.else
-DRIREVISION= 6
-PLIST= ${.CURDIR}/pkg-plist-old
-.endif
-
-.if ${PORT_OPTIONS:MGALLIUM}
-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
-RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
-CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
-
-CONFIGURE_ARGS+=--enable-gallium-llvm \
- --enable-xvmc \
- --with-gallium-drivers=r300,r600,radeonsi,svga,swrast
-PLIST_SUB+= GALLIUM=""
-.else
-CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
- --disable-gallium-egl
-PLIST_SUB+= GALLIUM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTEXTURE}
-CONFIGURE_ARGS+=--enable-texture-float
-.endif
-
-.if 0 #${PORT_OPTIONS:MVDPAU}
-.if ${PORT_OPTIONS:MGALLIUM} == ""
-IGNORE= VDPAU option requires GALLIUM support to be enabled
-.endif
-CONFIGURE_ARGS+=--enable-vdpau
-LIB_DEPENDS+= libvdpau.so:${PORTSDIR}/multimedia/libvdpau
-PLIST_SUB+= VDPAU=""
-.else
-CONFIGURE_ARGS+=--disable-vdpau
-PLIST_SUB+= VDPAU="@comment "
-.endif
-
-# empty for unsupported arches
-DRI_DRIVERS+=
-
-.for _d in ${ALL_DRI_DRIVERS}
-. if ${DRI_DRIVERS:M${_d}}
-PLIST_SUB+= ${_d}_DRIVER=""
-. else
-PLIST_SUB+= ${_d}_DRIVER="@comment "
-. endif
-.endfor
-
-CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
-
.include <bsd.port.mk>
Modified: trunk/graphics/dri/pkg-plist
===================================================================
--- trunk/graphics/dri/pkg-plist 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/dri/pkg-plist 2018-08-31 19:01:44 UTC (rev 24044)
@@ -4,7 +4,6 @@
@comment include/EGL/eglextchromium.h
@comment include/EGL/eglmesaext.h
@comment include/EGL/eglplatform.h
-include/GL/internal/dri_interface.h
@comment include/GL/gl.h
@comment include/GL/gl_mangle.h
@comment include/GL/glcorearb.h
@@ -12,25 +11,33 @@
@comment include/GL/glx.h
@comment include/GL/glx_mangle.h
@comment include/GL/glxext.h
+include/GL/internal/dri_interface.h
@comment include/GL/osmesa.h
- at comment include/GL/wglext.h
- at comment include/GL/wmesa.h
+ at comment include/GLES2/gl2.h
+ at comment include/GLES2/gl2ext.h
+ at comment include/GLES2/gl2platform.h
+ at comment include/GLES3/gl3.h
+ at comment include/GLES3/gl31.h
+ at comment include/GLES3/gl32.h
+ at comment include/GLES3/gl3ext.h
+ at comment include/GLES3/gl3platform.h
@comment include/KHR/khrplatform.h
@comment include/gbm.h
-%%GALLIUM%%lib/dri/kms_swrast_dri.so
%%I915_DRIVER%%lib/dri/i915_dri.so
%%I965_DRIVER%%lib/dri/i965_dri.so
+%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
%%R200_DRIVER%%lib/dri/r200_dri.so
-%%GALLIUM%%lib/dri/r300_dri.so
-%%GALLIUM%%lib/dri/r600_dri.so
+%%R300_GDRIVER%%lib/dri/r300_dri.so
+%%R600_GDRIVER%%lib/dri/r600_dri.so
%%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%GALLIUM%%lib/dri/radeonsi_dri.so
+%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%GALLIUM%%lib/dri/vmwgfx_dri.so
-%%GALLIUM%%lib/libXvMCr600.so
-%%GALLIUM%%lib/libXvMCr600.so.1
-%%GALLIUM%%lib/libXvMCr600.so.1.0
-%%GALLIUM%%lib/libXvMCr600.so.1.0.0
+%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
+ at comment lib/gallium-pipe/pipe_r300.so
+ at comment lib/gallium-pipe/pipe_r600.so
+ at comment lib/gallium-pipe/pipe_radeonsi.so
+ at comment lib/gallium-pipe/pipe_swrast.so
+ at comment lib/gallium-pipe/pipe_vmwgfx.so
@comment lib/libEGL.so
@comment lib/libEGL.so.1
@comment lib/libEGL.so.1.0.0
@@ -37,6 +44,19 @@
@comment lib/libGL.so
@comment lib/libGL.so.1
@comment lib/libGL.so.1.2.0
+ at comment lib/libGLESv2.so
+ at comment lib/libGLESv2.so.2
+ at comment lib/libGLESv2.so.2.0.0
+ at comment lib/libMesaOpenCL.so
+ at comment lib/libMesaOpenCL.so.1
+ at comment lib/libMesaOpenCL.so.1.0.0
+ at comment lib/libOSMesa.so
+ at comment lib/libOSMesa.so.8
+ at comment lib/libOSMesa.so.8.0.0
+%%R600_GDRIVER%%lib/libXvMCr600.so
+%%R600_GDRIVER%%lib/libXvMCr600.so.1
+%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
+%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
@comment lib/libgbm.so
@comment lib/libgbm.so.1
@comment lib/libgbm.so.1.0.0
@@ -55,7 +75,9 @@
%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1
%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0
%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
+libdata/pkgconfig/dri.pc
@comment libdata/pkgconfig/egl.pc
-libdata/pkgconfig/dri.pc
@comment libdata/pkgconfig/gbm.pc
@comment libdata/pkgconfig/gl.pc
+ at comment libdata/pkgconfig/glesv2.pc
+ at comment libdata/pkgconfig/osmesa.pc
Deleted: trunk/graphics/dri/pkg-plist-old
===================================================================
--- trunk/graphics/dri/pkg-plist-old 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/dri/pkg-plist-old 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,67 +0,0 @@
-%%I965_DRIVER%%etc/drirc
- at comment include/EGL/egl.h
- at comment include/EGL/eglext.h
- at comment include/EGL/eglmesaext.h
- at comment include/EGL/eglplatform.h
- at comment include/GL/gl.h
- at comment include/GL/gl_mangle.h
- at comment include/GL/glext.h
- at comment include/GL/glx.h
- at comment include/GL/glx_mangle.h
- at comment include/GL/glxext.h
-include/GL/internal/dri_interface.h
- at comment include/GL/osmesa.h
- at comment include/GL/wglext.h
- at comment include/GL/wmesa.h
- at comment include/KHR/khrplatform.h
- at comment include/gbm.h
-%%I915_DRIVER%%lib/dri/i915_dri.so
-%%I965_DRIVER%%lib/dri/i965_dri.so
-%%R200_DRIVER%%lib/dri/r200_dri.so
-%%GALLIUM%%lib/dri/r300_dri.so
-%%GALLIUM%%lib/dri/r600_dri.so
-%%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%GALLIUM%%lib/dri/radeonsi_dri.so
-%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%GALLIUM%%lib/dri/vmwgfx_dri.so
-%%GALLIUM%%lib/libXvMCr300.so
-%%GALLIUM%%lib/libXvMCr300.so.1
-%%GALLIUM%%lib/libXvMCr300.so.1.0.0
-%%GALLIUM%%lib/libXvMCr600.so
-%%GALLIUM%%lib/libXvMCr600.so.1
-%%GALLIUM%%lib/libXvMCr600.so.1.0.0
-%%GALLIUM%%lib/libXvMCsoftpipe.so
-%%GALLIUM%%lib/libXvMCsoftpipe.so.1
-%%GALLIUM%%lib/libXvMCsoftpipe.so.1.0.0
- at comment lib/libEGL.so
- at comment lib/libEGL.so.1
- at comment lib/libEGL.so.1.0.0
- at comment lib/libGL.so
- at comment lib/libGL.so.1
- at comment lib/libGL.so.1.2.0
-lib/libdricore9.1.7.so
-lib/libdricore9.1.7.so.1
-lib/libdricore9.1.7.so.1.0.0
- at comment lib/libgbm.so
- at comment lib/libgbm.so.1
- at comment lib/libgbm.so.1.0.0
- at comment lib/libglapi.so
- at comment lib/libglapi.so.0
- at comment lib/libglapi.so.0.0.0
-%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1
-%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0
-libdata/pkgconfig/dri.pc
- at comment libdata/pkgconfig/egl.pc
- at comment libdata/pkgconfig/gbm.pc
- at comment libdata/pkgconfig/gl.pc
Added: trunk/graphics/gbm/Makefile
===================================================================
--- trunk/graphics/gbm/Makefile (rev 0)
+++ trunk/graphics/gbm/Makefile 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,31 @@
+# $MidnightBSD$
+
+PORTNAME= gbm
+PORTVERSION= ${MESAVERSION}
+PORTREVISION= 0
+CATEGORIES= graphics
+
+COMMENT= gbm library
+
+LICENSE= mit
+
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
+LIB_DEPENDS+= libexpat.so:textproc/expat2 \
+ libdrm.so:graphics/libdrm \
+ libglapi.so:graphics/libglapi
+
+USE_XORG= x11 xau xcb xdmcp
+
+# stuff not needed by gbm but configure wants it
+USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
+ xshmfence
+
+.include <bsd.mport.options.mk>
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
+
+MESA_BUILD_WRKSRC= src/mapi src/gbm
+MESA_INSTALL_WRKSRC= src/gbm
+
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
+
+.include <bsd.port.mk>
Property changes on: trunk/graphics/gbm/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/gbm/pkg-descr
===================================================================
--- trunk/graphics/gbm/pkg-descr (rev 0)
+++ trunk/graphics/gbm/pkg-descr 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,3 @@
+This package contains the gbm utility library.
+
+WWW: http://mesa3d.org/
Property changes on: trunk/graphics/gbm/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/gbm/pkg-plist
===================================================================
--- trunk/graphics/gbm/pkg-plist (rev 0)
+++ trunk/graphics/gbm/pkg-plist 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,5 @@
+include/gbm.h
+lib/libgbm.so
+lib/libgbm.so.1
+lib/libgbm.so.1.0.0
+libdata/pkgconfig/gbm.pc
Property changes on: trunk/graphics/gbm/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/libEGL/Makefile
===================================================================
--- trunk/graphics/libEGL/Makefile 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libEGL/Makefile 2018-08-31 19:01:44 UTC (rev 24044)
@@ -2,7 +2,7 @@
PORTNAME= libEGL
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${LIBEGL_REVISION}
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= OpenEGL library
@@ -9,57 +9,23 @@
LICENSE= mit
-LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
- libexpat.so:${PORTSDIR}/textproc/expat2 \
- libdevq.so:${PORTSDIR}/devel/libdevq \
- libdrm.so:${PORTSDIR}/graphics/libdrm
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
+LIB_DEPENDS+= libexpat.so:textproc/expat2 \
+ libdrm.so:graphics/libdrm
-USES+= python:2
-
+USE_GL= gbm
USE_XORG= x11 xau xcb xdmcp
# stuff not needed by libEGL but configure wants it
-USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \
+USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
xshmfence
.include <bsd.mport.options.mk>
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
-.if defined(WITH_NEW_MESA)
-BUILD_WRKSRC= src/egl/drivers/dri2 src/egl/main
-INSTALL_WRKSRC= src/egl/drivers/dri2 src/egl/main
-.else
-BUILD_WRKSRC= ${WRKSRC}/src/egl
-INSTALL_WRKSRC= ${WRKSRC}/src/egl
-.endif
+MESA_BUILD_WRKSRC= src/mapi src/gbm src/egl/
+MESA_INSTALL_WRKSRC= src/egl
-.if defined(WITH_NEW_MESA)
-LIBEGL_REVISION= 0
-.else
-LIBEGL_REVISION= 5
-.endif
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
-.if defined(WITH_NEW_MESA)
-do-build: egl-do-build
-do-install: egl-do-install
-
-egl-do-build:
-. for dir in ${BUILD_WRKSRC}
- @(cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
-. endfor
-
-egl-do-install:
-. for dir in ${INSTALL_WRKSRC}
- @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${FAKE_MAKEENV} ${MAKE_CMD} \
- ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
-
-. endfor
-.endif
-
-post-install:
- @${MKDIR} ${PREFIX}/lib/.mesa
- @${MV} $${PREFIX}/lib/libEGL* \
- ${PREFIX}/lib/.mesa/
-
.include <bsd.port.mk>
Deleted: trunk/graphics/libEGL/pkg-deinstall
===================================================================
--- trunk/graphics/libEGL/pkg-deinstall 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libEGL/pkg-deinstall 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-DEINSTALL)
- /bin/rm -f ${PREFIX}/lib/libEGL.so*
- ;;
-esac
Modified: trunk/graphics/libEGL/pkg-descr
===================================================================
--- trunk/graphics/libEGL/pkg-descr 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libEGL/pkg-descr 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,3 +1,3 @@
This package contains the EGL utility library.
-WWW: http://www.freedesktop.org/Software/xorg
+WWW: http://mesa3d.org/
Deleted: trunk/graphics/libEGL/pkg-install
===================================================================
--- trunk/graphics/libEGL/pkg-install 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libEGL/pkg-install 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-POST-INSTALL)
- if [ -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ]; then
- /bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so
- /bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so.1
- else
- /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so
- /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1
- /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1.0.0
- fi
- ;;
-esac
Modified: trunk/graphics/libEGL/pkg-plist
===================================================================
--- trunk/graphics/libEGL/pkg-plist 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libEGL/pkg-plist 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,10 +1,10 @@
include/EGL/egl.h
include/EGL/eglext.h
-%%NEW%%include/EGL/eglextchromium.h
+include/EGL/eglextchromium.h
include/EGL/eglmesaext.h
include/EGL/eglplatform.h
include/KHR/khrplatform.h
-lib/.mesa/libEGL.so
-lib/.mesa/libEGL.so.1
-lib/.mesa/libEGL.so.1.0.0
+lib/libEGL.so
+lib/libEGL.so.1
+lib/libEGL.so.1.0.0
libdata/pkgconfig/egl.pc
Modified: trunk/graphics/libGL/Makefile
===================================================================
--- trunk/graphics/libGL/Makefile 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/Makefile 2018-08-31 19:01:44 UTC (rev 24044)
@@ -2,7 +2,7 @@
PORTNAME= libGL
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${LIBGLREVISION}
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= OpenGL library that renders using GLX or DRI
@@ -9,29 +9,23 @@
LICENSE= mit
-LIB_DEPENDS+= libdrm.so:${PORTSDIR}/graphics/libdrm \
- libglapi.so:${PORTSDIR}/graphics/libglapi \
- libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+= libdrm.so:graphics/libdrm \
+ libglapi.so:graphics/libglapi \
+ libexpat.so:textproc/expat2
-USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
- presentproto xshmfence
+USE_XORG= dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \
+ xfixes xshmfence xxf86vm
.include <bsd.mport.options.mk>
-.include "${.CURDIR}/bsd.mesalib.mk"
+.include "${.CURDIR}/Makefile.common"
-.if defined(WITH_NEW_MESA)
-LIBGLREVISION= 0
-.else
-LIBGLREVISION= 4
-.endif
+MESA_BUILD_WRKSRC= src/mapi src/glx
+MESA_INSTALL_WRKSRC= src/glx
-.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
+.include "${.CURDIR}/Makefile.targets"
post-install:
- @${MKDIR} ${PREFIX}/lib/.mesa
- @${MV} ${PREFIX}/lib/libGL* \
- ${PREFIX}/lib/.mesa/
+ @cd ${WRKSRC}/src && ${SETENV} DESTDIR=${FAKE_DESTDIR} \
+ ${MAKE_CMD} ${FAKE_MAKEARGS} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
.include <bsd.port.mk>
Added: trunk/graphics/libGL/Makefile.common
===================================================================
--- trunk/graphics/libGL/Makefile.common (rev 0)
+++ trunk/graphics/libGL/Makefile.common 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,188 @@
+# Makefile.common - shared code between MesaLib ports.
+#
+# !!! Here be dragons !!! (they seem to be everywhere these days)
+#
+# Remember to upgrade the following ports everytime you bump MESAVERSION:
+#
+# - graphics/dri
+# - graphics/gbm
+# - graphics/libEGL
+# - graphics/libGL
+# - graphics/libglapi
+# - graphics/libglesv2
+# - graphics/libosmesa
+# - lang/clover
+#
+# $FreeBSD: branches/2017Q2/graphics/libGL/Makefile.common 437215 2017-03-29 16:57:53Z rezny $
+# $MidnightBSD$
+
+MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
+MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
+
+MESABASEVERSION= 13.0.6
+# if there is a subversion, don't include the '-' between 7.11-rc2.
+MESASUBVERSION=
+
+MASTER_SITES= https://mesa.freedesktop.org/archive/ \
+ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
+ ftp://ftp.freedesktop.org/pub/mesa/ \
+ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+
+DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX}
+
+MAINTAINER= ports at MidnightBSD.org
+
+BUILD_DEPENDS+= makedepend:devel/makedepend
+
+USES+= compiler:c++11-lib bison gettext-tools gmake libtool \
+ localbase pathfix pkgconfig python:2,build shebangfix tar:xz
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+
+PKGINSTALL= ${.CURDIR}/pkg-install
+PKGDEINSTALL= ${.CURDIR}/pkg-deinstall
+
+# only have one port to check with portscout.
+.if ${PORTNAME} != libGL
+PORTSCOUT= ignore:1
+.endif
+
+python_OLD_CMD= "/usr/bin/env[[:space:]]python"
+python_CMD= ${LOCALBASE}/bin/python2
+SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
+ src/gallium/drivers/svga/svgadump/svga_dump.py \
+ src/mapi/glapi/gen/*.py
+SHEBANG_FILES+= src/mapi/mapi_abi.py
+
+MASTERDIR= ${.CURDIR}/../../graphics/libGL
+PATCHDIR= ${MASTERDIR}/files
+WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+INSTALL_TARGET= install-strip
+
+COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
+
+.if (${ARCH} != sparc64 && ${ARCH} != ia64) # no working LLVM
+MESA_LLVM_VER?= 39
+LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
+.endif
+
+CONFIGURE_ARGS+= --with-sha1=libcrypto
+
+CONFIGURE_ARGS+= --enable-gbm
+
+# There are issues that need to be fixed to use TLS model "initial-exec"
+# So stick with "global-dynamic"'s model for now. kan@ is working on a
+# patch for rtld. We might want to backport global-dynamic or
+# pthread_setspecific which it uses now by default. But since this
+# configure switch is going away ...
+# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
+CONFIGURE_ARGS+= --disable-glx-tls
+
+# libEGL, dri and clover need gallium enabled.
+# the third option in --with-egl-platforms is wayland.
+.if (${MESA_LLVM_VER} != "")
+CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm
+.else
+CONFIGURE_ARGS+= --disable-egl
+.endif
+
+# we don't care about GLes v1
+CONFIGURE_ARGS+= --disable-gles1 --enable-gles2
+
+# Clover (OpenCL).
+.if (${ARCH} == amd64 || ${ARCH} == i386)
+
+BUILD_DEPENDS+= libclc>=0.2.0.20160915:devel/libclc
+
+# We need the clang port too even if it is not used to compile because
+# Clover needs some of the clang includes to build.
+.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != ""
+_USES_pre_configure+= 290:clover-pre-configure
+
+# .if !exists() evaluates too early before cairo has a chance to be installed
+clover-pre-configure:
+ @if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \
+ ! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \
+ ${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not build with clang support, which is required."; \
+ ${FALSE}; \
+ fi
+.endif
+
+CONFIGURE_ARGS+= --enable-opencl --enable-opencl-icd
+.else
+CONFIGURE_ARGS+= --disable-opencl
+.endif
+
+CONFIGURE_ARGS+= --enable-osmesa --enable-xvmc
+
+# gallium
+.if (${MESA_LLVM_VER} != "")
+BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
+.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
+RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
+.endif
+
+CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
+
+CONFIGURE_ARGS+= --enable-gallium-llvm --enable-llvm-shared-libs
+.else
+CONFIGURE_ARGS+= --disable-gallium-llvm
+.endif
+
+.if ${PORT_OPTIONS:MTEXTURE}
+CONFIGURE_ARGS+=--enable-texture-float
+.endif
+
+# only support on DragonFly. FreeBSD's drm doesn't support it.
+.if ${OPSYS} == DragonFly && ${COMPONENT:Mdri} != ""
+CONFIGURE_ARGS+=--enable-vdpau
+LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau
+PLIST_SUB+= VDPAU=""
+.else
+CONFIGURE_ARGS+=--disable-vdpau
+PLIST_SUB+= VDPAU="@comment "
+.endif
+
+# VAAPI support?
+CONFIGURE_ARGS+=--disable-va
+
+ALL_DRI_DRIVERS= I915 I965 RADEON R200 SWRAST
+ALL_GALLIUM_DRIVERS= R300 R600 RADEONSI SVGA SWRAST
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+DRI_DRIVERS= I915 I965 RADEON R200
+GALLIUM_DRIVERS= R300 R600 RADEONSI SVGA
+.endif
+
+.if ${ARCH} == powerpc || ${ARCH} == powerpc64
+DRI_DRIVERS= RADEON R200
+GALLIUM_DRIVERS= R300 R600 RADEONSI
+.endif
+
+# software rendering for all arches
+DRI_DRIVERS+= SWRAST
+GALLIUM_DRIVERS+= SWRAST
+
+.for _d in ${ALL_DRI_DRIVERS}
+. if ${DRI_DRIVERS:M${_d}}
+PLIST_SUB+= ${_d}_DRIVER=""
+. else
+PLIST_SUB+= ${_d}_DRIVER="@comment "
+. endif
+.endfor
+
+CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
+
+.for _gd in ${ALL_GALLIUM_DRIVERS}
+. if ${GALLIUM_DRIVERS:M${_gd}}
+PLIST_SUB+= ${_gd}_GDRIVER=""
+. else
+PLIST_SUB+= ${_gd}_GDRIVER="@comment "
+. endif
+.endfor
+
+.if (${MESA_LLVM_VER} != "")
+CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
+.endif
Property changes on: trunk/graphics/libGL/Makefile.common
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/Makefile.targets
===================================================================
--- trunk/graphics/libGL/Makefile.targets (rev 0)
+++ trunk/graphics/libGL/Makefile.targets 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,50 @@
+# $MidnightBSD$
+# $FreeBSD: branches/2017Q2/graphics/libGL/Makefile.targets 437215 2017-03-29 16:57:53Z rezny $
+#
+# this file holds common targets
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|x86_64|amd64|' -e 's|\\S\*//|[:space:]* //|' \
+ ${WRKSRC}/configure
+# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
+#
+# glsl/cache.c:613:4: error: cannot compile this atomic library call yet
+# p_atomic_add(cache->size, size); note: expanded from macro 'p_atomic_add'
+# define p_atomic_add(v, i) (void) __atomic_add_fetch((v), (i), __ATOMIC_ACQ_REL)
+#
+.if ${ARCH} == "i386"
+ @${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
+.endif
+ @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+ ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
+ @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
+ ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
+ @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|g' \
+ ${WRKSRC}/src/mesa/main/get_hash_generator.py \
+ ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
+ ${WRKSRC}/src/mapi/glapi/gen/gl_table.py
+
+pre-build: mesa-pre-build
+
+#custom targets so we can build parts of Mesa
+mesa-pre-build:
+# do propper gmake target.
+ @cd ${WRKSRC}/src/mesa/drivers/dri/common/ && ${MAKE_CMD}
+ @cd ${WRKSRC}/src/loader && ${MAKE_CMD}
+# libloader.la
+
+.if defined(MESA_BUILD_WRKSRC)
+do-build:
+. for dir in ${MESA_BUILD_WRKSRC}
+ (cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
+. endfor
+.endif
+
+.if defined(MESA_INSTALL_WRKSRC)
+do-install:
+. for dir in ${MESA_INSTALL_WRKSRC}
+ (cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${FAKE_MAKEENV} ${MAKE_CMD} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
+. endfor
+.endif
+
Property changes on: trunk/graphics/libGL/Makefile.targets
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/graphics/libGL/bsd.mesalib.mk
===================================================================
--- trunk/graphics/libGL/bsd.mesalib.mk 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/bsd.mesalib.mk 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,153 +0,0 @@
-# bsd.mesalib.mk - shared code between MesaLib ports.
-#
-# !!! Here be dragons !!! (they seem to be everywhere these days)
-#
-# Remember to upgrade the following ports everytime you bump MESAVERSION:
-#
-# - graphics/dri
-# - graphics/gbm
-# - graphics/libEGL
-# - graphics/libGL
-# - graphics/libglapi
-# - graphics/libglesv2
-# - graphics/libosmesa
-# - lang/clover
-#
-# $MidnightBSD$
-# $FreeBSD: head/graphics/libGL/bsd.mesalib.mk 380804 2015-03-08 21:42:51Z kwm $
-
-MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
-MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-
-.if defined(WITH_NEW_MESA)
-MESABASEVERSION= 10.4.6
-# if there is a subversion, don't include the '-' between 7.11-rc2.
-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
-
-.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
-
-DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
-MAINTAINER= ports at MidnightBSD.org
-
-BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
- ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-
-LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq
-
-USES+= bison gettext-tools gmake libtool pathfix pkgconfig \
- python:2,build shebangfix tar:bzip2
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-
-CPPFLAGS+= -isystem${LOCALBASE}/include
-LDFLAGS+= -Wl,-Y${LOCALBASE}/lib
-
-PKGINSTALL= ${.CURDIR}/pkg-install
-PKGDEINSTALL= ${.CURDIR}/pkg-deinstall
-
-BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex
-
-python_OLD_CMD= "/usr/bin/env[[:space:]]python"
-python_CMD= ${LOCALBASE}/bin/python2
-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
-
-MASTERDIR= ${.CURDIR}/../../graphics/libGL
-.if defined(WITH_NEW_MESA)
-PATCHDIR= ${MASTERDIR}/files
-CONFIGURE_ARGS+= --disable-dri3
-.else
-PATCHDIR= ${MASTERDIR}/files-old
-.endif
-DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
-WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION}
-INSTALL_TARGET= install-strip
-
-COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
-
-.if defined(WITH_NEW_MESA)
-MESA_LLVM_VER=35
-.else
-MESA_LLVM_VER=33
-.endif
-
-.if ${COMPONENT:Mglesv2} == ""
-CONFIGURE_ARGS+= --disable-gles2
-.else
-CONFIGURE_ARGS+= --enable-gles2
-.endif
-
-.if ${COMPONENT:Megl} == ""
-CONFIGURE_ARGS+= --disable-egl
-.else
-CONFIGURE_ARGS+= --enable-egl
-.endif
-
-.if ${COMPONENT:Mclover} == ""
-CONFIGURE_ARGS+= --disable-opencl
-.else
-CONFIGURE_ARGS+= --enable-opencl
-.endif
-
-.if ${COMPONENT:Mdri} == "" && ${COMPONENT:Mclover} == ""
-CONFIGURE_ARGS+=--with-dri-drivers=no
-CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
-.else
-# done in the dri port
-# need to enable this globaly because it also used in dri ..
-# the third possible option is wayland.
-CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm
-.endif
-
-.if ${COMPONENT:Mvdpau} == ""
-CONFIGURE_ARGS+=--disable-vdpau
-.else
-CONFIGURE_ARGS+=--enable-vdpau
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
-.if !defined(WITH_NEW_MESA)
- @${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
- ${WRKSRC}/src/glsl/builtins/tools/*.py
-.else
- @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
-.endif
- @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|g' \
- ${WRKSRC}/src/mesa/main/get_hash_generator.py \
- ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
- ${WRKSRC}/src/mapi/glapi/gen/gl_table.py
-
-pre-build: pre-mesa-build
-
-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
-
Modified: trunk/graphics/libGL/distinfo
===================================================================
--- trunk/graphics/libGL/distinfo 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/distinfo 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,4 +1,3 @@
-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
+TIMESTAMP = 1490202594
+SHA256 (mesa-13.0.6.tar.xz) = 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597
+SIZE (mesa-13.0.6.tar.xz) = 9179236
Modified: trunk/graphics/libGL/files/configure.ac
===================================================================
--- trunk/graphics/libGL/files/configure.ac 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/configure.ac 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,23 +1,6 @@
---- configure.ac.orig 2014-11-18 03:23:13.000000000 +0100
-+++ configure.ac 2014-11-21 12:50:56.104986267 +0100
-@@ -37,6 +37,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
-@@ -54,7 +55,7 @@
- AM_PROG_CC_C_O
- AM_PROG_AS
- AX_CHECK_GNU_MAKE
--AC_CHECK_PROGS([PYTHON2], [python2 python])
-+AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
- AC_PROG_SED
- AC_PROG_MKDIR_P
-
-@@ -617,7 +618,7 @@
+--- configure.ac.orig 2016-06-21 14:31:09.000000000 +0200
++++ configure.ac 2016-07-08 13:05:53.236433000 +0200
+@@ -871,7 +872,7 @@
[enable_dri=yes])
case "$host_os" in
@@ -26,28 +9,7 @@
dri3_default=yes
;;
*)
-@@ -883,6 +884,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)
-+
- AC_ARG_ENABLE([sysfs],
- [AS_HELP_STRING([--enable-sysfs],
- [enable /sys PCI identification @<:@default=disabled@:>@])],
-@@ -979,6 +983,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
-
- if test "$have_sysfs" = yes; then
- DEFINES="$DEFINES -DHAVE_SYSFS"
-@@ -1101,6 +1109,23 @@
+@@ -1540,6 +1548,19 @@
;;
gnu*)
DEFINES="$DEFINES -DHAVE_ALIAS"
@@ -56,10 +18,6 @@
+ DEFINES="$DEFINES -DHAVE_DRI3"
+ fi
+
-+ if test "x$have_libdevq" != xyes; then
-+ AC_MSG_ERROR([libdevq required for building DRI])
-+ fi
-+
+ case "$host_cpu" in
+ powerpc* | sparc*)
+ # Build only the drivers for cards that exist on PowerPC/sparc
@@ -71,16 +29,40 @@
;;
cygwin*)
if test "x$with_dri_drivers" = "xyes"; then
-@@ -1278,6 +1303,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"
-+elif test "x$need_libdevq" = xyes; then
-+ GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
- else
- GBM_PC_REQ_PRIV=""
- fi
-@@ -1724,8 +1751,6 @@
+@@ -1921,9 +1948,19 @@
+ AC_MSG_ERROR([cannot enable OpenCL without Gallium])
+ fi
+
++ if test "x$acv_mesa_CLANG" = xno; then
++
++ GCC_VERSION=`$CC -dumpversion`
++ if test $? -eq 0; then
++ GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
++ GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
++ fi
++
+ if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
+ AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
+ fi
++# end of clang test.
++ fi
+
+ if test "x$have_libclc" = xno; then
+ AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
+@@ -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}
Modified: trunk/graphics/libGL/files/patch-configure
===================================================================
--- trunk/graphics/libGL/files/patch-configure 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-configure 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,54 +1,8 @@
---- configure.orig 2014-11-21 12:54:55.273970976 +0100
-+++ configure 2014-11-21 12:55:25.070967392 +0100
-@@ -853,6 +853,8 @@
- GLPROTO_CFLAGS
- XLIBGL_LIBS
- XLIBGL_CFLAGS
-+LIBDEVQ_LIBS
-+LIBDEVQ_CFLAGS
- LIBUDEV_LIBS
- LIBUDEV_CFLAGS
- LIBDRM_LIBS
-@@ -1143,6 +1145,8 @@
- LIBDRM_LIBS
- LIBUDEV_CFLAGS
- LIBUDEV_LIBS
-+LIBDEVQ_CFLAGS
-+LIBDEVQ_LIBS
- XLIBGL_CFLAGS
- XLIBGL_LIBS
- GLPROTO_CFLAGS
-@@ -1942,6 +1946,10 @@
- C compiler flags for LIBUDEV, overriding pkg-config
- LIBUDEV_LIBS
- linker flags for LIBUDEV, overriding pkg-config
-+ LIBDEVQ_CFLAGS
-+ C compiler flags for LIBDEVQ, overriding pkg-config
-+ LIBDEVQ_LIBS
-+ linker flags for LIBDEVQ, overriding pkg-config
- XLIBGL_CFLAGS
- C compiler flags for XLIBGL, overriding pkg-config
- XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
-@@ -5085,6 +5093,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 @@
- fi
+--- configure.orig 2017-01-05 15:52:21 UTC
++++ configure
+@@ -21955,7 +21955,7 @@ fi
--for ac_prog in python2 python
-+for ac_prog in python2.7 python2 python
- 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 @@
-
-
case "$host_os" in
-linux*)
+linux*|freebsd*)
@@ -55,108 +9,14 @@
dri3_default=yes
;;
*)
-@@ -20543,6 +20552,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; }
-+
-+if test -n "$LIBDEVQ_CFLAGS"; then
-+ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$LIBDEVQ_LIBS"; then
-+ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
-+ else
-+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$LIBDEVQ_PKG_ERRORS" >&5
-+
-+ have_libdevq=no
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ have_libdevq=no
-+else
-+ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
-+ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ have_libdevq=yes
-+fi
-+
- # Check whether --enable-sysfs was given.
- if test "${enable_sysfs+set}" = set; then :
- enableval=$enable_sysfs; have_sysfs="$enableval"
-@@ -21258,6 +21339,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
-
- if test "$have_sysfs" = yes; then
- DEFINES="$DEFINES -DHAVE_SYSFS"
-@@ -21385,6 +21470,22 @@
+@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then
;;
- gnu*)
+ *freebsd* | dragonfly* | *netbsd* | openbsd*)
DEFINES="$DEFINES -DHAVE_ALIAS"
+ if test "x$enable_dri3" = xyes; then
+ DEFINES="$DEFINES -DHAVE_DRI3"
+ fi
+
-+ if test "x$have_libdevq" != xyes; then
-+ as_fn_error $? "libdevq required for building DRI" "$LINENO" 5
-+ fi
-+
+ case "$host_cpu" in
+ powerpc* | sparc*)
+ # Build only the drivers for cards that exist on PowerPC/sparc
@@ -166,18 +26,29 @@
+ ;;
+ esac
;;
- cygwin*)
- if test "x$with_dri_drivers" = "xyes"; then
-@@ -22205,6 +22306,8 @@
+ gnu*)
+ DEFINES="$DEFINES -DHAVE_ALIAS"
+@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
+ as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
+ fi
- 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-1.0 >= $LIBDEVQ_REQUIRED"
- else
- GBM_PC_REQ_PRIV=""
- fi
-@@ -23628,9 +23731,6 @@
++ if test "x$acv_mesa_CLANG" = xno; then
++
++ GCC_VERSION=`$CC -dumpversion`
++ if test $? -eq 0; then
++ GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
++ GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
++ fi
++
+ if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
+ as_fn_error $? "gcc >= 4.7 is required to build clover" "$LINENO" 5
+ fi
++# end of clang test.
++ fi
+
+ if test "x$have_libclc" = xno; then
+ as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
+@@ -26670,9 +26692,6 @@ fi
CLANG_LIBDIR=${LLVM_LIBDIR}
fi
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
Added: trunk/graphics/libGL/files/patch-include__GL__internal__dri_interface.h
===================================================================
--- trunk/graphics/libGL/files/patch-include__GL__internal__dri_interface.h (rev 0)
+++ trunk/graphics/libGL/files/patch-include__GL__internal__dri_interface.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,19 @@
+GCC on 9.x doesn't allow types to be overwritten, these types are defined
+in drm.h also, which causes build issues in xorg-server.
+
+--- include/GL/internal/dri_interface.h.orig 2016-11-10 22:05:17 UTC
++++ include/GL/internal/dri_interface.h
+@@ -40,13 +40,7 @@
+ #ifndef DRI_INTERFACE_H
+ #define DRI_INTERFACE_H
+
+-#ifdef HAVE_LIBDRM
+ #include <drm.h>
+-#else
+-typedef unsigned int drm_context_t;
+-typedef unsigned int drm_drawable_t;
+-typedef struct drm_clip_rect drm_clip_rect_t;
+-#endif
+
+ /**
+ * \name DRI interface structures
Property changes on: trunk/graphics/libGL/files/patch-include__GL__internal__dri_interface.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c
===================================================================
--- trunk/graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c (rev 0)
+++ trunk/graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,118 @@
+Revert the following commit.
+
+FreeBSD and DragonFly don't have the required render nodes.
+
+-------
+
+From 69a1b9959e59653da262185c4e2cf57d24939b19 Mon Sep 17 00:00:00 2001
+From: Emil Velikov <emil.l.velikov at gmail.com>
+Date: Mon, 29 Jun 2015 12:36:45 +0100
+Subject: pipe-loader: drop support for non-render node devices
+
+Render nodes have been around for quite some time. Removing support via
+the master/primary node allows us to clean up the conditional
+compilation and simplify the build greatly.
+
+For example currently we the pipe-loader, which explicitly links against
+xcb and friends (for X auth) if found at compile-time. That
+would cause problems as one will be forced to use X/xcb, even if it's a
+headless system that is used for opencl.
+
+v2: Clarify the linking topic in the commit message.
+
+Cc: Tom Stellard <thomas.stellard at amd.com>
+Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
+Reviewed-by: Francisco Jerez <currojerez at riseup.net>
+
+
+--- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig 2016-11-10 22:05:17 UTC
++++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+@@ -215,6 +215,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa
+ }
+
+ static int
++open_drm_minor(int minor)
++{
++ char path[PATH_MAX];
++ snprintf(path, sizeof(path), DRM_DEV_NAME, DRM_DIR_NAME, minor);
++ return open(path, O_RDWR, 0);
++}
++
++static int
+ open_drm_render_node_minor(int minor)
+ {
+ char path[PATH_MAX];
+@@ -226,8 +234,15 @@ open_drm_render_node_minor(int minor)
+ int
+ pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
+ {
+- int i, j, fd;
++ int i, k, fd, num_render_node_devs;
++ int j = 0;
++
++ struct {
++ unsigned vendor_id;
++ unsigned chip_id;
++ } render_node_devs[DRM_RENDER_NODE_MAX_NODES];
+
++ /* Look for render nodes first */
+ for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0;
+ i <= DRM_RENDER_NODE_MAX_MINOR; i++) {
+ struct pipe_loader_device *dev;
+@@ -241,6 +256,9 @@ pipe_loader_drm_probe(struct pipe_loader
+ continue;
+ }
+
++ render_node_devs[j].vendor_id = dev->u.pci.vendor_id;
++ render_node_devs[j].chip_id = dev->u.pci.chip_id;
++
+ if (j < ndev) {
+ devs[j] = dev;
+ } else {
+@@ -250,6 +268,46 @@ pipe_loader_drm_probe(struct pipe_loader
+ j++;
+ }
+
++ num_render_node_devs = j;
++
++ /* Next look for drm devices. */
++ for (i = 0; i < DRM_MAX_MINOR; i++) {
++ struct pipe_loader_device *dev;
++ boolean duplicate = FALSE;
++ fd = open_drm_minor(i);
++ if (fd < 0)
++ continue;
++
++ if (!pipe_loader_drm_probe_fd(&dev, fd)) {
++ close(fd);
++ continue;
++ }
++
++ /* Check to make sure we aren't already accessing this device via
++ * render nodes.
++ */
++ for (k = 0; k < num_render_node_devs; k++) {
++ if (dev->u.pci.vendor_id == render_node_devs[k].vendor_id &&
++ dev->u.pci.chip_id == render_node_devs[k].chip_id) {
++ close(fd);
++ dev->ops->release(&dev);
++ duplicate = TRUE;
++ break;
++ }
++ }
++
++ if (duplicate)
++ continue;
++
++ if (j < ndev) {
++ devs[j] = dev;
++ } else {
++ dev->ops->release(&dev);
++ }
++
++ j++;
++ }
++
+ return j;
+ }
+
Property changes on: trunk/graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c
===================================================================
--- trunk/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,11 +0,0 @@
---- src/gallium/auxiliary/util/u_cpu_detect.c.orig 2014-09-19 18:23:33 UTC
-+++ src/gallium/auxiliary/util/u_cpu_detect.c
-@@ -52,7 +52,7 @@
- #include <machine/cpu.h>
- #endif
-
--#if defined(PIPE_OS_FREEBSD)
-+#if defined(PIPE_OS_FREEBSD) || defined(PIPE_OS_DRAGONFLY)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
Deleted: trunk/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c
===================================================================
--- trunk/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,24 +0,0 @@
---- ./src/gallium/drivers/r300/r300_chipset.c.orig 2014-01-06 22:15:40.000000000 +0100
-+++ ./src/gallium/drivers/r300/r300_chipset.c 2014-02-23 22:01:50.000000000 +0100
-@@ -53,6 +53,21 @@
- if (!os_get_process_name(proc_name, sizeof(proc_name)))
- return;
-
-+#if defined(__MidnightBSD__) || \
-+ defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || \
-+ defined(__OpenBSD__)
-+ const char *progname, *program_invocation_short_name;
-+
-+ progname = getprogname();
-+ program_invocation_short_name = strrchr(progname, '/');
-+ if (program_invocation_short_name) {
-+ program_invocation_short_name++;
-+ } else {
-+ program_invocation_short_name = progname;
-+ }
-+#endif
-+
- for (i = 0; i < Elements(list); i++) {
- if (strcmp(list[i], proc_name) == 0) {
- caps->zmask_ram = 0;
Modified: trunk/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h
===================================================================
--- trunk/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,7 +1,7 @@
---- src/gallium/include/pipe/p_config.h.orig 2014-08-14 17:22:24 UTC
+--- src/gallium/include/pipe/p_config.h.orig 2016-11-10 22:05:17 UTC
+++ src/gallium/include/pipe/p_config.h
-@@ -81,6 +81,13 @@
- #define PIPE_CC_SUNPRO
+@@ -76,6 +76,13 @@
+ #define PIPE_CC_ICL
#endif
+#if defined(__sparc__) || defined(__sparc64__)
@@ -14,12 +14,21 @@
/*
* Processor architecture
-@@ -200,6 +207,12 @@
+@@ -130,7 +137,7 @@
+
+ #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
+ #define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390)
++#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
+ #define PIPE_ARCH_BIG_ENDIAN
+ #endif
+
+@@ -159,6 +166,12 @@
#define PIPE_OS_ANDROID
#endif
-+#if defined(__MidnightBSD__)
-+#define PIPE_OS_FREEBSD
++#if defined(__DragonFly__)
++#define PIPE_OS_DRAGONFLY
+#define PIPE_OS_BSD
+#define PIPE_OS_UNIX
+#endif
Modified: trunk/graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp
===================================================================
--- trunk/graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp 2018-08-31 19:01:44 UTC (rev 24044)
@@ -5,13 +5,7 @@
See:
https://bugs.freedesktop.org/show_bug.cgi?id=74098#c3
----
- src/gallium/state_trackers/clover/util/range.hpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/state_trackers/clover/util/range.hpp b/src/gallium/state_trackers/clover/util/range.hpp
-index afa5f77..359edda 100644
---- src/gallium/state_trackers/clover/util/range.hpp
+--- src/gallium/state_trackers/clover/util/range.hpp.orig 2016-11-10 22:05:17 UTC
+++ src/gallium/state_trackers/clover/util/range.hpp
@@ -362,6 +362,12 @@ namespace clover {
return { i, i + n };
@@ -35,6 +29,3 @@
map(F &&f, Rs &&... rs) {
return { std::forward<F>(f), std::forward<Rs>(rs)... };
}
---
-1.8.5.4
-
Modified: trunk/graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c
===================================================================
--- trunk/graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,10 +1,10 @@
---- ./src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig 2014-01-06 22:15:40.000000000 +0100
-+++ ./src/gallium/winsys/svga/drm/vmw_screen_ioctl.c 2014-02-23 22:01:50.000000000 +0100
-@@ -66,6 +66,11 @@
- */
- #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9)
+--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig 2016-11-10 22:05:17 UTC
++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
+@@ -70,6 +70,11 @@ vmw_region_size(struct vmw_region *regio
+ return region->size;
+ }
-+#if defined(__MidnightBSD__) || defined(__FreeBSD__) || \
++#if defined(__DragonFly__) || defined(__FreeBSD__) || \
+ defined(__NetBSD__) || defined(__OpenBSD__)
+#define ERESTART EINTR
+#endif
Deleted: trunk/graphics/libGL/files/patch-src__glsl__ir_constant_expression.cpp
===================================================================
--- trunk/graphics/libGL/files/patch-src__glsl__ir_constant_expression.cpp 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__glsl__ir_constant_expression.cpp 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,14 +0,0 @@
---- ./src/glsl/ir_constant_expression.cpp.orig 2014-02-05 21:59:10.000000000 +0100
-+++ ./src/glsl/ir_constant_expression.cpp 2014-02-23 22:01:50.000000000 +0100
-@@ -60,6 +60,11 @@
- }
- #endif
-
-+#include <sys/param.h>
-+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
-+#define log2(x) (log(x) / log(2))
-+#endif
-+
- static float
- dot(ir_constant *op0, ir_constant *op1)
- {
Deleted: trunk/graphics/libGL/files/patch-src__loader__Makefile.in
===================================================================
--- trunk/graphics/libGL/files/patch-src__loader__Makefile.in 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__loader__Makefile.in 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,20 +0,0 @@
---- 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 @@
- 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)
- libloader_la_SOURCES = $(LOADER_C_FILES) $(am__append_2)
- libloader_la_LIBADD = $(am__append_3) $(am__append_6)
- all: all-am
Deleted: trunk/graphics/libGL/files/patch-src__loader__loader.c
===================================================================
--- trunk/graphics/libGL/files/patch-src__loader__loader.c 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__loader__loader.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,90 +0,0 @@
---- 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 <stdarg.h>
- #include <stdio.h>
- #include <string.h>
--#ifdef HAVE_LIBUDEV
-+#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ)
- #include <assert.h>
- #include <dlfcn.h>
- #include <fcntl.h>
-@@ -488,6 +488,53 @@
- }
- #endif
-
-+#if defined(HAVE_LIBDEVQ)
-+#include <libdevq.h>
-+
-+static void *devq_handle = NULL;
-+
-+static void *
-+devq_dlopen_handle(void)
-+{
-+ if (!devq_handle) {
-+ devq_handle = dlopen("libdevq.so.0", RTLD_LOCAL | RTLD_LAZY);
-+ }
-+
-+ return devq_handle;
-+}
-+
-+static void *
-+asserted_dlsym(void *dlopen_handle, const char *name)
-+{
-+ void *result = dlsym(dlopen_handle, name);
-+ assert(result);
-+ return result;
-+}
-+
-+#define DEVQ_SYMBOL(ret, name, args) \
-+ ret (*name) args = asserted_dlsym(devq_dlopen_handle(), #name);
-+
-+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,
-+ (int fd, int *vendor_id, int *chip_id));
-+
-+ *chip_id = -1;
-+
-+ ret = devq_device_get_pciid_from_fd(fd, vendor_id, chip_id);
-+ if (ret < 0) {
-+ log_(_LOADER_WARNING, "MESA-LOADER: could not get PCI ID\n");
-+ goto out;
-+ }
-+
-+out:
-+ return (*chip_id >= 0);
-+}
-+
-+#endif
-+
- #if !defined(__NOT_HAVE_DRM_H)
- /* for i915 */
- #include <i915_drm.h>
-@@ -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;
- }
-
Deleted: trunk/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h
===================================================================
--- trunk/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -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)
Deleted: trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h
===================================================================
--- trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -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)
Deleted: trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h
===================================================================
--- trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -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)
Modified: trunk/graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py
===================================================================
--- trunk/graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,11 +1,11 @@
---- src/mapi/glapi/gen/gl_gentable.py.orig 2014-11-21 13:09:28.624910062 +0100
-+++ src/mapi/glapi/gen/gl_gentable.py 2014-11-21 13:10:48.294268333 +0100
-@@ -42,7 +42,7 @@
+--- src/mapi/glapi/gen/gl_gentable.py.orig 2017-01-06 02:14:06 UTC
++++ src/mapi/glapi/gen/gl_gentable.py
+@@ -44,7 +44,7 @@ header = """/* GLXEXT is the define used
#endif
#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__))
-+ || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__MidnightBSD__))
++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__))
#define USE_BACKTRACE
#endif
Modified: trunk/graphics/libGL/files/patch-src__mesa__main__compiler.h
===================================================================
--- trunk/graphics/libGL/files/patch-src__mesa__main__compiler.h 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/files/patch-src__mesa__main__compiler.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,10 +1,10 @@
---- ./src/mesa/main/compiler.h.orig 2014-01-23 18:02:42.000000000 +0100
-+++ ./src/mesa/main/compiler.h 2014-02-23 22:01:50.000000000 +0100
-@@ -162,6 +162,9 @@
+--- src/mesa/main/compiler.h.orig 2016-11-10 22:05:17 UTC
++++ src/mesa/main/compiler.h
+@@ -56,6 +56,9 @@ extern "C" {
#if defined(__linux__)
#include <byteswap.h>
#define CPU_TO_LE32( x ) bswap_32( x )
-+#elif defined(__MidnightBSD__)
++#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define CPU_TO_LE32( x ) bswap32( x )
#elif defined(__APPLE__)
Added: trunk/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c
===================================================================
--- trunk/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c (rev 0)
+++ trunk/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,11 @@
+--- src/gallium/auxiliary/util/u_network.c.orig 2016-11-10 22:05:17 UTC
++++ src/gallium/auxiliary/util/u_network.c
+@@ -6,7 +6,7 @@
+ #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+ # include <winsock2.h>
+ # include <windows.h>
+-#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
++#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_HAIKU) || \
+ defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
+ # include <sys/socket.h>
+ # include <netinet/in.h>
Property changes on: trunk/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
===================================================================
--- trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp (rev 0)
+++ trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,30 @@
+# fix errors like the following
+#
+# llvm/invocation.cpp:(.text+0x1275): undefined reference to `std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::c_str()
+ const'
+# /usr/bin/ld: ../../../../src/gallium/state_trackers/clover/.libs/libclover.a(libclllvm_la-invocation.o): relocation R_X86_64_PC32 against `_ZNKSt3__112bas
+ic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv' can not be used when making a shared object; recompile with -fPIC
+# /usr/bin/ld: final link failed: Bad value
+#
+--- src/gallium/state_trackers/clover/llvm/invocation.cpp.orig 2016-11-28 15:34:30 UTC
++++ src/gallium/state_trackers/clover/llvm/invocation.cpp
+@@ -93,6 +93,8 @@ namespace {
+ return ctx;
+ }
+
++ const char* cstr(const std::string& str) { return str.c_str(); }
++
+ std::unique_ptr<clang::CompilerInstance>
+ create_compiler_instance(const target &target,
+ const std::vector<std::string> &opts,
+@@ -104,8 +106,8 @@ namespace {
+ // Parse the compiler options. A file name should be present at the end
+ // and must have the .cl extension in order for the CompilerInvocation
+ // class to recognize it as an OpenCL source file.
+- const std::vector<const char *> copts =
+- map(std::mem_fn(&std::string::c_str), opts);
++ std::vector<const char *> copts;
++ std::transform(opts.begin(), opts.end(), copts.begin(), cstr);
+
+ if (!clang::CompilerInvocation::CreateFromArgs(
+ c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))
Property changes on: trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
===================================================================
--- trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp (rev 0)
+++ trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,13 @@
+# Fix error: no matching constructor for initialization of 'std::vector<const ::llvm::MDNode *>'
+#
+--- src/gallium/state_trackers/clover/llvm/metadata.hpp.orig 2016-11-10 22:05:17 UTC
++++ src/gallium/state_trackers/clover/llvm/metadata.hpp
+@@ -42,7 +42,7 @@ namespace clover {
+ get_kernel_nodes(const ::llvm::Module &mod) {
+ if (const ::llvm::NamedMDNode *n =
+ mod.getNamedMetadata("opencl.kernels"))
+- return { n->op_begin(), n->op_end() };
++ return { n->getOperand(0), n->getOperand(n->getNumOperands()) };
+ else
+ return {};
+ }
Property changes on: trunk/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/files/patch-src_intel_tools_aubinator.c
===================================================================
--- trunk/graphics/libGL/files/patch-src_intel_tools_aubinator.c (rev 0)
+++ trunk/graphics/libGL/files/patch-src_intel_tools_aubinator.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,14 @@
+# We don't have MAP_NORESERVE so use MAP_NOSYNC | MAP_NOCORE and
+# hope for the best (this alloc is too big but it's only a test)
+#
+--- src/intel/tools/aubinator.c.orig 2016-11-28 15:34:30 UTC
++++ src/intel/tools/aubinator.c
+@@ -1226,7 +1226,7 @@ int main(int argc, char *argv[])
+ /* mmap a terabyte for our gtt space. */
+ gtt_size = 1ul << 40;
+ gtt = mmap(NULL, gtt_size, PROT_READ | PROT_WRITE,
+- MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NOSYNC | MAP_NOCORE, -1, 0);
+ if (gtt == MAP_FAILED) {
+ fprintf(stderr, "failed to alloc gtt space: %s\n", strerror(errno));
+ exit(EXIT_FAILURE);
Property changes on: trunk/graphics/libGL/files/patch-src_intel_tools_aubinator.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/files/patch-src_util_ralloc.c
===================================================================
--- trunk/graphics/libGL/files/patch-src_util_ralloc.c (rev 0)
+++ trunk/graphics/libGL/files/patch-src_util_ralloc.c 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,18 @@
+--- src/util/ralloc.c.orig 2016-11-28 15:34:30 UTC
++++ src/util/ralloc.c
+@@ -315,6 +315,7 @@ ralloc_parent(const void *ptr)
+
+ static void *autofree_context = NULL;
+
++__attribute__((destructor))
+ static void
+ autofree(void)
+ {
+@@ -326,7 +327,6 @@ ralloc_autofree_context(void)
+ {
+ if (unlikely(autofree_context == NULL)) {
+ autofree_context = ralloc_context(NULL);
+- atexit(autofree);
+ }
+ return autofree_context;
+ }
Property changes on: trunk/graphics/libGL/files/patch-src_util_ralloc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/libGL/files/patch-src_util_u__endian.h
===================================================================
--- trunk/graphics/libGL/files/patch-src_util_u__endian.h (rev 0)
+++ trunk/graphics/libGL/files/patch-src_util_u__endian.h 2018-08-31 19:01:44 UTC (rev 24044)
@@ -0,0 +1,11 @@
+--- src/util/u_endian.h.orig 2016-11-10 22:05:17 UTC
++++ src/util/u_endian.h
+@@ -54,7 +54,7 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+
+-#elif defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/types.h>
+ #include <machine/endian.h>
+
Property changes on: trunk/graphics/libGL/files/patch-src_util_u__endian.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/graphics/libGL/pkg-deinstall
===================================================================
--- trunk/graphics/libGL/pkg-deinstall 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/pkg-deinstall 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-DEINSTALL)
- /bin/rm -f ${PREFIX}/lib/libGL.so*
- ;;
-esac
Deleted: trunk/graphics/libGL/pkg-install
===================================================================
--- trunk/graphics/libGL/pkg-install 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/pkg-install 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-POST-INSTALL)
- if [ -f ${PREFIX}/lib/.nvidia/libGL.so.1 ]; then
- /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so
- /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1
- else
- /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so
- /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1
- /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
- fi
- ;;
-esac
Modified: trunk/graphics/libGL/pkg-plist
===================================================================
--- trunk/graphics/libGL/pkg-plist 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libGL/pkg-plist 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,20 +1,11 @@
- at comment etc/drirc
- at comment include/GL/internal/dri_interface.h
include/GL/gl.h
include/GL/gl_mangle.h
-%%NEW%%include/GL/glcorearb.h
+include/GL/glcorearb.h
include/GL/glext.h
include/GL/glx.h
include/GL/glx_mangle.h
include/GL/glxext.h
-include/GL/osmesa.h
-include/GL/wglext.h
-include/GL/wmesa.h
-lib/.mesa/libGL.so
-lib/.mesa/libGL.so.1
-lib/.mesa/libGL.so.1.2.0
- at comment lib/libglapi.so
- at comment lib/libglapi.so.0
- at comment lib/libglapi.so.0.0.0
- at comment libdata/pkgconfig/dri.pc
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.2.0
libdata/pkgconfig/gl.pc
Modified: trunk/graphics/libglapi/Makefile
===================================================================
--- trunk/graphics/libglapi/Makefile 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libglapi/Makefile 2018-08-31 19:01:44 UTC (rev 24044)
@@ -2,7 +2,7 @@
PORTNAME= libglapi
PORTVERSION= ${MESAVERSION}
-PORTREVISION= ${LIBGLAPI_REVISION}
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= Common GL api library used by Mesa based ports
@@ -9,31 +9,27 @@
LICENSE= mit
-LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
-USE_XORG= x11 xau xcb xdmcp
+USE_XORG= x11 xau xcb xdmcp xvmc
# stuff not needed by libglapi but configure wants it
-USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \
+USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
xshmfence
-LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \
- libdrm.so:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS+= libexpat.so:textproc/expat2 \
+ libdrm.so:graphics/libdrm
.include <bsd.mport.options.mk>
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
-.if defined (WITH_NEW_MESA)
-LIBGLAPI_REVISION= 0
-.else
-LIBGLAPI_REVISION= 2
-.endif
+MESA_BUILD_WRKSRC= src/mapi
+MESA_INSTALL_WRKSRC= src/mapi
-.if defined (WITH_NEW_MESA)
-BUILD_WRKSRC= ${WRKSRC}/src/mapi
-INSTALL_WRKSRC= ${WRKSRC}/src/mapi
-.else
-BUILD_WRKSRC= ${WRKSRC}/src/mapi/shared-glapi
-INSTALL_WRKSRC= ${WRKSRC}/src/mapi/shared-glapi
-.endif
+.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
+post-install:
+ @${RM} -r ${STAGEDIR}${PREFIX}/include/GLES*
+ @${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so*
+ @${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/glesv2.pc
+
.include <bsd.port.mk>
Modified: trunk/graphics/libglapi/pkg-descr
===================================================================
--- trunk/graphics/libglapi/pkg-descr 2018-08-31 18:00:29 UTC (rev 24043)
+++ trunk/graphics/libglapi/pkg-descr 2018-08-31 19:01:44 UTC (rev 24044)
@@ -1,3 +1,3 @@
-This package contains the EGL utility library.
+This package contains the GL API utility library.
-WWW: http://www.freedesktop.org/Software/xorg
+WWW: http://mesa3d.org/
More information about the Midnightbsd-cvs
mailing list