Attachment 127465 Details for Bug 171301 – file.diff

[patch] file.diff

file.diff (text/plain), 4.71 KB, created by Mark Linimon on 2012-09-04 01:50:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2012-09-04 01:50:04 UTC

Size: 4.71 KB

patch

obsolete

>Index: graphics/libGLU/Makefile
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/graphics/libGLU/Makefile,v
>retrieving revision 1.15
>diff -u -r1.15 Makefile
>--- graphics/libGLU/Makefile	21 Apr 2012 17:03:17 -0000	1.15
>+++ graphics/libGLU/Makefile	20 Aug 2012 19:14:51 -0000
>@@ -21,4 +21,11 @@
> 	cd ${WRKSRC}/src/glu; ${GMAKE} install
> 
> .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
>-.include <bsd.port.mk>
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} != "amd64" || ${ARCH} != "i386"
>+CONFIGURE_ARGS+=--disable-gallium-intel
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: graphics/libGLw/Makefile
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/graphics/libGLw/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- graphics/libGLw/Makefile	21 Apr 2012 17:03:17 -0000	1.13
>+++ graphics/libGLw/Makefile	20 Aug 2012 19:15:37 -0000
>@@ -19,4 +19,11 @@
> 	cd ${WRKSRC}/src/glw; ${GMAKE} install
> 
> .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
>-.include <bsd.port.mk>
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} != "amd64" || ${ARCH} != "i386"
>+CONFIGURE_ARGS+=--disable-gallium-intel
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: graphics/libdrm/pkg-plist
>===================================================================
>--- graphics/libdrm/pkg-plist	(revision 303629)
>+++ graphics/libdrm/pkg-plist	(working copy)
>@@ -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 @@
> 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
>Index: graphics/libdrm/Makefile
>===================================================================
>--- graphics/libdrm/Makefile	(revision 303629)
>+++ graphics/libdrm/Makefile	(working copy)
>@@ -52,10 +52,12 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.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:

Actions: View | Diff

Attachments on bug 171301: 127465