[pkgsrc/trunk]: pkgsrc/graphics/Mesa The previous commit message was botched;...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c3ae4856ed3
branches:  trunk
changeset: 542034:4c3ae4856ed3
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Apr 30 07:09:48 2008 +0000

description:
The previous commit message was botched; this commit message applies
to graphics/MesaLib as well.

I've added some distribution patches for bug fixes (yes, already, it's
true) and proper DragonFly support (see the sysctl-related changes
in MesaLib/Makefile).  Agressively tracking these patches is the only
way to ensure we squash as many bugs as possible.  No patches in a
given release branch (in this case Mesa_7_0_branch) should ever
merit a bump to BUILDLINK_ABI_DEPENDS.

The head GIT commit ref for patch 002 is:
27b6fa56156673d6e7e6839658bae10de161588b

In the future, I'm going to write some sort of script or something
to manage this, but this will suffice for now.  I may also break
out some of the patch logic into a seperate mk file so that it can
be included by the xorg server, thereby ensuring the sources
are synchronized.

In other news:  I have patches for libdrm to use NetBSD's atomic
ops.  They aren't used in the library proper.  Rather, the
DRM_CAS macro in xf86drm.h now uses atomic_cas_uint.  This is, I believe,
important for proper operation, as this macro is used for context/device
locks in userland.  When I commit the update to libdrm, I will simultaneously
commit a new drm_atomic.h in the kernel.  The atomic ops there now
really do not merit the designation 'atomic'.

diffstat:

 graphics/Mesa/Makefile.common |  11 ++++++++---
 graphics/Mesa/Makefile.lib    |   3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r df4c1c021818 -r 4c3ae4856ed3 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common     Wed Apr 30 07:00:14 2008 +0000
+++ b/graphics/Mesa/Makefile.common     Wed Apr 30 07:09:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2008/04/25 20:49:13 joerg Exp $
+# $NetBSD: Makefile.common,v 1.61 2008/04/30 07:09:48 bjs Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -18,13 +18,18 @@
 #      graphics/glx-utils
 #
 MESA_VERSION=          7.0.3
-MESA_PKGVERSION=       ${MESA_VERSION:S/-rc/rc/}
+MESA_PKGVERSION=       ${MESA_VERSION}${MESA_PATCHLEVEL}
+MESA_PATCHFILES=       001 002
+MESA_PATCHLEVEL=       ${MESA_PATCHFILES:O:[-1]:C|^[0^]*|.|}
+
+PATCHFILES=            ${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
+PATCH_SITES=           ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=            bjs%NetBSD.org@localhost
 HOMEPAGE=              http://www.mesa3d.org/
 
 PKG_DESTDIR_SUPPORT=   user-destdir
-MAKE_JOBS_SAFE=                no
 
 WRKSRC=                        ${WRKDIR}/Mesa-${MESA_VERSION}
 BUILDING_MESA=         yes
diff -r df4c1c021818 -r 4c3ae4856ed3 graphics/Mesa/Makefile.lib
--- a/graphics/Mesa/Makefile.lib        Wed Apr 30 07:00:14 2008 +0000
+++ b/graphics/Mesa/Makefile.lib        Wed Apr 30 07:09:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.9 2008/04/27 09:43:12 tnn Exp $
+# $NetBSD: Makefile.lib,v 1.10 2008/04/30 07:09:48 bjs Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -14,6 +14,7 @@
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
+LIBTOOL=               ${PKG_SHLIBTOOL}
 USE_TOOLS+=            gmake makedepend pkg-config
 
 PATCHDIR=              ${.CURDIR}/../MesaLib/patches