summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-05-27 06:45:30 +0000
committerwiz <wiz@pkgsrc.org>2013-05-27 06:45:30 +0000
commit706ebff0be2b24aa46b3d0e3e73b039ee74d799e (patch)
tree9f1a8da310c7c279b6e6795c5d3388c1f15307b2 /graphics
parentf352f8002550682ebcad4e68f9fd854b584d30b4 (diff)
downloadpkgsrc-706ebff0be2b24aa46b3d0e3e73b039ee74d799e.tar.gz
Allow the dri option on NetBSD even with native x (compile-tested by
Patrick Welche) and enable it by default there too; bump libdrm requirement (from Patrick Welche). Also enable dri on Linux by default, not only for Linux with modular X. Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/Makefile3
-rw-r--r--graphics/MesaLib/options.mk17
2 files changed, 7 insertions, 13 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index d7af7bb9a75..b1db9333a28 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2013/05/16 05:22:02 richard Exp $
+# $NetBSD: Makefile,v 1.92 2013/05/27 06:45:30 wiz Exp $
PKGNAME= MesaLib-${MESA_PKGVERSION}
+PKGREVISION= 1
COMMENT= Graphics library similar to SGI's OpenGL
CONFLICTS+= xf86driproto<2.0.4
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index 74b62774fd8..b95ccaaa1e4 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2013/05/20 07:04:35 sbd Exp $
+# $NetBSD: options.mk,v 1.23 2013/05/27 06:45:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
PKG_SUPPORTED_OPTIONS=
@@ -17,23 +17,16 @@ PKG_SUPPORTED_OPTIONS=
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64") && \
- ((${OPSYS} == "NetBSD" && ${X11_TYPE} == "modular") || \
+ (${OPSYS} == "NetBSD" || \
${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
${OPSYS} == "SunOS")
PKG_SUPPORTED_OPTIONS+= dri
.endif
-###
-### XXX OpenGL still works fine with the software fallback. As of now,
-### I think this is a good way to see which bugs surface before the
-### next release branch. Upgrading the X server to the 1.4 branch
-### is advised given that it's glx/glcore modules are built from
-### Mesa 6.5.3 (a development release).
-###
-.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*) && ${X11_TYPE} == "modular"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-*86*)
PKG_SUGGESTED_OPTIONS+= dri
.endif
-.if !empty(MACHINE_PLATFORM:MLinux-*-*86*) && ${X11_TYPE} == "modular"
+.if !empty(MACHINE_PLATFORM:MLinux-*-*86*)
PKG_SUGGESTED_OPTIONS+= dri
.endif
@@ -55,7 +48,7 @@ PKG_SUGGESTED_OPTIONS+= dri
.if !empty(PKG_OPTIONS:Mdri)
CONFIGURE_ARGS+= --with-driver=dri
PLIST.dri= yes
-BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.9
+BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.24
. include "../../sysutils/libpciaccess/buildlink3.mk"
. include "../../graphics/MesaLib/dri.mk"
CONFIGURE_ARGS+= --with-dri-drivers="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome"