Date: Fri, 13 Dec 2013 12:21:17 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336340 - in head/graphics: dri libGL/files libGL/files-old Message-ID: <201312131221.rBDCLHad017139@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Dec 13 12:21:17 2013 New Revision: 336340 URL: http://svnweb.freebsd.org/changeset/ports/336340 Log: Fix graphics/dri on ia64. Please note that WITH_NEW_XORG isn't tested due to other issues. Submitted by: marcel@ Modified: head/graphics/dri/Makefile head/graphics/libGL/files-old/patch-configure head/graphics/libGL/files/patch-configure Modified: head/graphics/dri/Makefile ============================================================================== --- head/graphics/dri/Makefile Fri Dec 13 11:57:27 2013 (r336339) +++ head/graphics/dri/Makefile Fri Dec 13 12:21:17 2013 (r336340) @@ -31,10 +31,6 @@ USE_GCC=yes . endif .endif -.if ${ARCH} == ia64 -#BROKEN= does not install on ia64 -.endif - ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST .if !defined(WITH_NEW_XORG) @@ -45,7 +41,7 @@ ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R3 PLIST_SUB+= VERSION=${MESADISTVERSION} -.if ${ARCH} == amd64 || ${ARCH} == i386 +.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif @@ -62,7 +58,7 @@ PLIST_SUB+= GALLIUM="" CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers PLIST_SUB+= GALLIUM="@comment " . endif -. if ${ARCH} == powerpc || ${ARCH} == ia64 +. if ${ARCH} == powerpc DRI_DRIVERS= RADEON SWRAST . endif . if ${ARCH} == sparc64 Modified: head/graphics/libGL/files-old/patch-configure ============================================================================== --- head/graphics/libGL/files-old/patch-configure Fri Dec 13 11:57:27 2013 (r336339) +++ head/graphics/libGL/files-old/patch-configure Fri Dec 13 12:21:17 2013 (r336340) @@ -1,5 +1,14 @@ ---- configure.orig 2009-12-22 03:31:30.000000000 +0100 -+++ configure 2012-06-27 19:49:26.000000000 +0200 +--- configure.orig 2013-12-12 18:52:32.304356162 +0000 ++++ configure 2013-12-12 19:50:44.434111814 +0000 +@@ -5393,7 +5393,7 @@ + ;; + *freebsd* | dragonfly*) + case "$host_cpu" in +- i*86|x86_64|powerpc*|sparc*) default_driver="dri";; ++ i*86|x86_64|ia64|powerpc*|sparc*) default_driver="dri";; + esac + ;; + esac @@ -6946,12 +6946,35 @@ CXXFLAGS="$CXXFLAGS -ansi -pedantic" fi @@ -9,7 +18,7 @@ - if test "x$DRI_DIRS" = "xyes"; then - DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ + case "$host_cpu" in -+ x86_64) ++ x86_64|ia64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then Modified: head/graphics/libGL/files/patch-configure ============================================================================== --- head/graphics/libGL/files/patch-configure Fri Dec 13 11:57:27 2013 (r336339) +++ head/graphics/libGL/files/patch-configure Fri Dec 13 12:21:17 2013 (r336340) @@ -8,7 +8,7 @@ - DRI_DIRS="i915 i965 nouveau r200 radeon swrast" - fi + case "$host_cpu" in -+ x86_64) ++ x86_64|ia64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312131221.rBDCLHad017139>