svn commit: r399625 - in head/graphics: dri libGL

[Koop Mast]

Author: kwm
Date: Sun Oct 18 18:31:55 2015
New Revision: 399625
URL: https://svnweb.freebsd.org/changeset/ports/399625

Log:
  * Don't hardcode the Gallium drivers instead set the wanted drivers per
    arch, like is done for the dri drivers. This fixes Mesa build on arm. [1]
  * Explicitly disable libva support. This resolves a build issue if libva
    is installed. [2]
  * remove the gallium-intel configure flag, it is gone.
  
  PR:		197548 [2]
  Reported by:	sbruno@ [1]
  Reported by:	rozhuk.im at gmail.com [2]
  Tested by:	sbruno@ on arm [1]

Modified:
  head/graphics/dri/pkg-plist
  head/graphics/libGL/Makefile.common

Modified: head/graphics/dri/pkg-plist
==============================================================================
--- head/graphics/dri/pkg-plist	Sun Oct 18 17:33:20 2015	(r399624)
+++ head/graphics/dri/pkg-plist	Sun Oct 18 18:31:55 2015	(r399625)
@@ -26,14 +26,14 @@ include/GL/internal/dri_interface.h
 @comment include/gbm.h
 %%I915_DRIVER%%lib/dri/i915_dri.so
 %%I965_DRIVER%%lib/dri/i965_dri.so
-lib/dri/kms_swrast_dri.so
+%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
-lib/dri/r300_dri.so
-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
-lib/dri/radeonsi_dri.so
+%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-lib/dri/vmwgfx_dri.so
+%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
 @comment lib/gallium-pipe/pipe_r300.so
 @comment lib/gallium-pipe/pipe_r600.so
 @comment lib/gallium-pipe/pipe_radeonsi.so
@@ -54,10 +54,10 @@ lib/dri/vmwgfx_dri.so
 @comment lib/libOSMesa.so
 @comment lib/libOSMesa.so.8
 @comment lib/libOSMesa.so.8.0.0
-lib/libXvMCr600.so
-lib/libXvMCr600.so.1
-lib/libXvMCr600.so.1.0
-lib/libXvMCr600.so.1.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

Modified: head/graphics/libGL/Makefile.common
==============================================================================
--- head/graphics/libGL/Makefile.common	Sun Oct 18 17:33:20 2015	(r399624)
+++ head/graphics/libGL/Makefile.common	Sun Oct 18 18:31:55 2015	(r399625)
@@ -109,17 +109,12 @@ RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=0:
 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
+                --enable-xvmc
 
 .if ${PORT_OPTIONS:MTEXTURE}
 CONFIGURE_ARGS+=--enable-texture-float
 .endif
 
-.if !(${ARCH} == amd64 || ${ARCH} == i386)
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
-
 # this is disabled because our kernel driver is too old
 # merge this and the one below when support does land.
 .if 0 #${PORT_OPTIONS:MVDPAU}
@@ -141,21 +136,30 @@ CONFIGURE_ARGS+=--disable-vdpau
 CONFIGURE_ARGS+=--enable-vdpau
 .endif
 
+# VAAPI support?
+CONFIGURE_ARGS+=--disable-va
+
 ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
+ALL_GALLIUM_DRIVERS=R300 R600 RADEONSI SVGA SWRAST
 
 .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64
 DRI_DRIVERS=	${ALL_DRI_DRIVERS}
+GALLIUM_DRIVERS=	${ALL_GALLIUM_DRIVERS}
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS=	RADEON SWRAST
+GALLIUM_DRIVERS=	RADEON SWRAST
 .endif
+
 .if ${ARCH} == sparc64 || ${ARCH} == armv6
 DRI_DRIVERS=	SWRAST
+GALLIUM_DRIVERS=	SWRAST
 .endif
 
 # empty for unsupported arches
 DRI_DRIVERS+=
+GALLIUM_DRIVERS+=
 
 .for _d in ${ALL_DRI_DRIVERS}
 . if ${DRI_DRIVERS:M${_d}}
@@ -167,3 +171,13 @@ PLIST_SUB+=	${_d}_DRIVER="@comment "
 
 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
+
+CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
+