[Midnightbsd-cvs] mports [17041] trunk/graphics/dri: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 13 21:23:16 EDT 2014
Revision: 17041
http://svnweb.midnightbsd.org/mports/?rev=17041
Author: laffer1
Date: 2014-09-13 21:23:15 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/graphics/dri/Makefile
trunk/graphics/dri/files/patch-bin__mklib
trunk/graphics/dri/pkg-plist
Added Paths:
-----------
trunk/graphics/dri/files/patch-src_mesa_Makefile
Property Changed:
----------------
trunk/graphics/dri/files/patch-bin__mklib
Modified: trunk/graphics/dri/Makefile
===================================================================
--- trunk/graphics/dri/Makefile 2014-09-14 00:56:35 UTC (rev 17040)
+++ trunk/graphics/dri/Makefile 2014-09-14 01:23:15 UTC (rev 17041)
@@ -2,7 +2,7 @@
PORTNAME= dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= graphics
@@ -9,48 +9,74 @@
COMMENT= OpenGL hardware acceleration drivers for the DRI
LICENSE= mit
-LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \
- expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \
+ libexpat.so:${PORTSDIR}/textproc/expat2
-USE_PKGCONFIG= build
+USES+= gettext:build pkgconfig
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
-ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
- SAVAGE SIS SWRAST TDFX UNICHROME
+.include <bsd.mport.options.mk>
+# gcc from base can't handle some code in mesa 9.1+
+# We only care for 9.x and 8.x, not for old pre-clang default current.
+# This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
+.if defined(WITH_NEW_XORG)
+. if (${OSVERSION} >= 5000) \
+ && ${ARCH} == amd64
+CC=clang
+CXX=clang++
+CPP=clang-cpp
+. elif ${OSVERSION} < 5000
+USE_GCC=yes
+. endif
+.endif
+
+ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
+
+.if !defined(WITH_NEW_XORG)
+ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
+.endif
+
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-OPTIONS_DEFINE= ${ALL_DRI_DRIVERS}
-.elif ${ARCH} == "powerpc"
-OPTIONS_DEFINE= MACH64 RADEON SWRAST TDFX
-.elif ${ARCH} == "sparc64"
-OPTIONS_DEFINE= MACH64 RADEON SWRAST
+PLIST_SUB+= VERSION=${MESADISTVERSION}
+
+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64
+DRI_DRIVERS= ${ALL_DRI_DRIVERS}
.endif
-OPTIONS_DEFAULT=${OPTIONS_DEFINE}
-I810_DESC= Include DRI support for Intel i810
-I915_DESC= Include DRI support for Intel i915
-I965_DESC= Include DRI support for Intel i965
-MACH64_DESC= Include DRI support for AMD/ATI Mach64
-MGA_DESC= Include DRI support for Matrox
-R128_DESC= Include DRI support for AMD/ATI R128
-R200_DESC= Include DRI support for AMD/ATI R200
-R300_DESC= Include DRI support for AMD/ATI R300
-R600_DESC= Include DRI support for AMD/ATI R600
-RADEON_DESC= Include DRI support for AMD/ATI R100
-SAVAGE_DESC= Include DRI support for S3/Via Savage
-SIS_DESC= Include DRI support for SiS 300 and 6326
-SWRAST_DESC= Include generic software DRI support
-TDFX_DESC= Include DRI support for 3dfx Voodoo
-UNICHROME_DESC= Include DRI support for S3/Via Unichrome
+.if defined(WITH_NEW_XORG)
+. if !defined(WITHOUT_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64)
+BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33
+CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33
-.include <bsd.mport.options.mk>
+CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl
-DRI_DRIVERS=
+CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast
+PLIST_SUB+= GALLIUM=""
+. else
+CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
+PLIST_SUB+= GALLIUM="@comment "
+. endif
+. if ${ARCH} == powerpc || ${ARCH} == powerpc64
+DRI_DRIVERS= RADEON SWRAST
+. endif
+. if ${ARCH} == sparc64 || ${ARCH} == armv6
+DRI_DRIVERS= SWRAST
+. endif
+.else # !defined(WITH_NEW_XORG)
+. if ${ARCH} == powerpc || ${ARCH} == powerpc64
+DRI_DRIVERS= MACH64 RADEON SWRAST TDFX
+. elif ${ARCH} == sparc64
+DRI_DRIVERS= MACH64 RADEON SWRAST
+. endif
+.endif # defined(WITH_NEW_XORG)
+
+# empty for unsupported arches
+DRI_DRIVERS+=
+
.for _d in ${ALL_DRI_DRIVERS}
-.if ${PORT_OPTIONS:M${_d}}
-DRI_DRIVERS+= ${_d}
+.if ${DRI_DRIVERS:M${_d}}
PLIST_SUB+= ${_d}_DRIVER=""
.else
PLIST_SUB+= ${_d}_DRIVER="@comment "
@@ -57,14 +83,31 @@
.endif
.endfor
-.include <bsd.port.pre.mk>
-
-.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
+.if !(${ARCH} == amd64 || ${ARCH} == i386)
CONFIGURE_ARGS+=--disable-gallium-intel
.endif
-CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
+CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
-do-install:
- cd ${WRKSRC}/src/mesa; ${GMAKE} ${FAKE_MAKEARGS} install-dri
+.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \
+ && (${ARCH} == i386 || ${ARCH} == amd64)
+pre-everything::
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers."
+ @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf"
+ @${ECHO_MSG} "Note that gallium support is highly experimental."
+ @${ECHO_MSG} ""
+.endif
-.include <bsd.port.post.mk>
+post-install:
+.if defined(WITH_NEW_XORG)
+ @${RM} -f ${PREFIX}/include/GL/*.h
+ @${RM} ${PREFIX}/lib/libGL.*
+ @${RM} ${PREFIX}/lib/libglapi.*
+ @${RM} -f ${PREFIX}/libdata/pkgconfig/gl.pc
+.else
+ @${RM} -f ${PREFIX}/include/GL/*.h
+ @${RM} -rf ${PREFIX}/lib/.libGL
+ @${RM} -f ${PREFIX}/libdata/pkgconfig/gl.pc
+.endif
+
+.include <bsd.port.mk>
Modified: trunk/graphics/dri/files/patch-bin__mklib
===================================================================
--- trunk/graphics/dri/files/patch-bin__mklib 2014-09-14 00:56:35 UTC (rev 17040)
+++ trunk/graphics/dri/files/patch-bin__mklib 2014-09-14 01:23:15 UTC (rev 17041)
@@ -1,6 +1,6 @@
---- bin/mklib.bak 2009-03-15 15:22:11 -0400
-+++ bin/mklib 2009-03-15 15:22:25 -0400
-@@ -420,7 +420,7 @@
+--- ./bin/mklib.orig Mon Oct 1 03:11:55 2007
++++ ./bin/mklib Mon Oct 1 03:12:02 2007
+@@ -356,7 +356,7 @@
fi
;;
Property changes on: trunk/graphics/dri/files/patch-bin__mklib
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/graphics/dri/files/patch-src_mesa_Makefile
===================================================================
--- trunk/graphics/dri/files/patch-src_mesa_Makefile (rev 0)
+++ trunk/graphics/dri/files/patch-src_mesa_Makefile 2014-09-14 01:23:15 UTC (rev 17041)
@@ -0,0 +1,15 @@
+--- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200
++++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200
+@@ -183,10 +183,10 @@
+ $(DESTDIR)$(INSTALL_INC_DIR)/GL
+
+ install-libgl: default gl.pc install-headers
+- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+- $(DESTDIR)$(INSTALL_LIB_DIR)
++ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL
+ $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+
+ install-osmesa: default osmesa.pc
Modified: trunk/graphics/dri/pkg-plist
===================================================================
--- trunk/graphics/dri/pkg-plist 2014-09-14 00:56:35 UTC (rev 17040)
+++ trunk/graphics/dri/pkg-plist 2014-09-14 01:23:15 UTC (rev 17041)
@@ -1,19 +1,39 @@
+%%NEW%%%%I965_DRIVER%%etc/drirc
include/GL/internal/dri_interface.h
-%%I810_DRIVER%%lib/dri/i810_dri.so
+%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so
+%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la
%%I915_DRIVER%%lib/dri/i915_dri.so
+%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la
%%I965_DRIVER%%lib/dri/i965_dri.so
-%%MACH64_DRIVER%%lib/dri/mach64_dri.so
-%%MGA_DRIVER%%lib/dri/mga_dri.so
-%%R128_DRIVER%%lib/dri/r128_dri.so
+%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
+%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la
%%R200_DRIVER%%lib/dri/r200_dri.so
-%%R300_DRIVER%%lib/dri/r300_dri.so
-%%R600_DRIVER%%lib/dri/r600_dri.so
+%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
+%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la
+%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so
+%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
+%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la
+%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so
+%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la
%%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
-%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la
+%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so
+%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la
%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
-%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la
+%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so
+%%NEW%%lib/libdricore%%VERSION%%.la
+%%NEW%%lib/libdricore%%VERSION%%.so
+%%NEW%%lib/libdricore%%VERSION%%.so.1
+%%NEW%%lib/libdricore%%VERSION%%.so.1.0.0
+%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la
+%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
libdata/pkgconfig/dri.pc
@dirrm lib/dri
@dirrmtry include/GL/internal
More information about the Midnightbsd-cvs
mailing list