From owner-svn-ports-all@FreeBSD.ORG Mon Sep 17 03:23:04 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DD2A1065674; Mon, 17 Sep 2012 03:23:04 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0ED958FC0C; Mon, 17 Sep 2012 03:23:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8H3N3fj038019; Mon, 17 Sep 2012 03:23:03 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8H3N3Ld038013; Mon, 17 Sep 2012 03:23:03 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201209170323.q8H3N3Ld038013@svn.freebsd.org> From: Steve Wills Date: Mon, 17 Sep 2012 03:23:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304385 - in head/graphics: libGLU libGLw libdrm X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Sep 2012 03:23:04 -0000 Author: swills Date: Mon Sep 17 03:23:03 2012 New Revision: 304385 URL: http://svn.freebsd.org/changeset/ports/304385 Log: - Fix build on PowerPC PR: ports/171301 Submitted by: linimon Modified: head/graphics/libGLU/Makefile head/graphics/libGLw/Makefile head/graphics/libdrm/Makefile (contents, props changed) head/graphics/libdrm/pkg-plist (contents, props changed) Modified: head/graphics/libGLU/Makefile ============================================================================== --- head/graphics/libGLU/Makefile Mon Sep 17 02:37:38 2012 (r304384) +++ head/graphics/libGLU/Makefile Mon Sep 17 03:23:03 2012 (r304385) @@ -22,4 +22,11 @@ do-install: cd ${WRKSRC}/src/glu; ${GMAKE} install .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -.include + +.include + +.if ${ARCH} != "amd64" || ${ARCH} != "i386" +CONFIGURE_ARGS+=--disable-gallium-intel +.endif + +.include Modified: head/graphics/libGLw/Makefile ============================================================================== --- head/graphics/libGLw/Makefile Mon Sep 17 02:37:38 2012 (r304384) +++ head/graphics/libGLw/Makefile Mon Sep 17 03:23:03 2012 (r304385) @@ -20,4 +20,11 @@ do-install: cd ${WRKSRC}/src/glw; ${GMAKE} install .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -.include + +.include + +.if ${ARCH} != "amd64" || ${ARCH} != "i386" +CONFIGURE_ARGS+=--disable-gallium-intel +.endif + +.include Modified: head/graphics/libdrm/Makefile ============================================================================== --- head/graphics/libdrm/Makefile Mon Sep 17 02:37:38 2012 (r304384) +++ head/graphics/libdrm/Makefile Mon Sep 17 03:23:03 2012 (r304385) @@ -52,10 +52,12 @@ PLIST_SUB+= OLD="" NEW="@comment " .include -.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" -PLIST_SUB+= X86="" +.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc" +PLIST_SUB+= INTEL_DRIVER="" +PLIST_SUB+= RADEON_DRIVERS="" .else -PLIST_SUB+= X86="@comment " +PLIST_SUB+= INTEL_DRIVER="@comment" +PLIST_SUB+= RADEON_DRIVERS="@comment" .endif pre-patch: Modified: head/graphics/libdrm/pkg-plist ============================================================================== --- head/graphics/libdrm/pkg-plist Mon Sep 17 02:37:38 2012 (r304384) +++ head/graphics/libdrm/pkg-plist Mon Sep 17 03:23:03 2012 (r304385) @@ -11,28 +11,28 @@ %%OLD%%include/drm/savage_drm.h %%OLD%%include/drm/sis_drm.h %%OLD%%include/drm/via_drm.h -%%OLD%%%%X86%%include/intel_bufmgr.h +%%OLD%%%%INTEL_DRIVER%%include/intel_bufmgr.h %%NEW%%include/libdrm/drm.h %%NEW%%include/libdrm/drm_fourcc.h %%NEW%%include/libdrm/drm_mode.h %%NEW%%include/libdrm/drm_sarea.h %%NEW%%include/libdrm/i915_drm.h -%%NEW%%%%X86%%include/libdrm/intel_bufmgr.h -%%NEW%%%%X86%%include/libdrm/intel_debug.h +%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h +%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h %%NEW%%include/libdrm/nouveau_drm.h %%NEW%%include/libdrm/nouveau_drmif.h %%NEW%%include/libdrm/r128_drm.h -%%NEW%%%%X86%%include/libdrm/r600_pci_ids.h -%%NEW%%%%X86%%include/libdrm/radeon_bo.h -%%NEW%%%%X86%%include/libdrm/radeon_bo_gem.h -%%NEW%%%%X86%%include/libdrm/radeon_bo_int.h -%%NEW%%%%X86%%include/libdrm/radeon_cs.h -%%NEW%%%%X86%%include/libdrm/radeon_cs_gem.h -%%NEW%%%%X86%%include/libdrm/radeon_cs_int.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h %%NEW%%include/libdrm/radeon_drm.h -%%NEW%%%%X86%%include/libdrm/radeon_surface.h +%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_surface.h %%NEW%%include/libdrm/savage_drm.h %%NEW%%include/libdrm/sis_drm.h %%NEW%%include/libdrm/via_drm.h @@ -53,22 +53,22 @@ include/xf86drmMode.h lib/libdrm.la lib/libdrm.so lib/libdrm.so.2 -%%X86%%lib/libdrm_intel.la -%%X86%%lib/libdrm_intel.so -%%X86%%lib/libdrm_intel.so.1 +%%INTEL_DRIVER%%lib/libdrm_intel.la +%%INTEL_DRIVER%%lib/libdrm_intel.so +%%INTEL_DRIVER%%lib/libdrm_intel.so.1 lib/libdrm_nouveau.la lib/libdrm_nouveau.so lib/libdrm_nouveau.so.1 -%%NEW%%%%X86%%lib/libdrm_radeon.la -%%NEW%%%%X86%%lib/libdrm_radeon.so -%%NEW%%%%X86%%lib/libdrm_radeon.so.1 +%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la +%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so +%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%NEW%%%%KMS%%lib/libkms.la %%NEW%%%%KMS%%lib/libkms.so %%NEW%%%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc -%%X86%%libdata/pkgconfig/libdrm_intel.pc +%%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc libdata/pkgconfig/libdrm_nouveau.pc -%%NEW%%%%X86%%libdata/pkgconfig/libdrm_radeon.pc +%%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc @dirrm include/nouveau %%NEW%%%%KMS%%@dirrm include/libkms