pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Mesa-6.0 packages now use LIBTOOL and finally...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bcca83b15416
branches: trunk
changeset: 466721:bcca83b15416
user: adam <adam%pkgsrc.org@localhost>
date: Thu Jan 22 12:58:07 2004 +0000
description:
Mesa-6.0 packages now use LIBTOOL and finally build
diffstat:
graphics/Mesa/Makefile | 17 +++++++--------
graphics/Mesa/Makefile.common | 31 +++++++++++++--------------
graphics/MesaLib/Makefile | 21 +++++++++----------
graphics/MesaLib/PLIST | 11 ++++++---
graphics/MesaLib/buildlink2.mk | 3 +-
graphics/MesaLib/distinfo | 8 +++++-
graphics/MesaLib/patches/patch-ab | 8 +++---
graphics/MesaLib/patches/patch-ad | 42 +++++++++++++++++++++++++++++++++++++++
graphics/MesaLib/patches/patch-ae | 25 +++++++++++++++++++++++
graphics/MesaLib/patches/patch-af | 29 ++++++++++++++++++++++++++
graphics/MesaLib/patches/patch-ag | 24 ++++++++++++++++++++++
graphics/glu/Makefile | 23 ++++++++++-----------
graphics/glu/PLIST | 5 ++-
graphics/glu/patches/patch-aa | 13 ------------
graphics/glu/patches/patch-ae | 17 ---------------
15 files changed, 186 insertions(+), 91 deletions(-)
diffs (truncated from 434 to 300 lines):
diff -r 3caffe96b58e -r bcca83b15416 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/Mesa/Makefile Thu Jan 22 12:58:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2004/01/20 02:48:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.56 2004/01/22 12:58:07 adam Exp $
#
PKGNAME= Mesa-${MESA_VERSION}
@@ -10,14 +10,13 @@
CONFLICTS= Mesa-glx-[0-9]*
-USE_BUILDLINK2= yes
-
-USE_X11= yes
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-NO_PATCH= yes
-EXTRACT_ONLY= # empty
+USE_BUILDLINK2= yes
+USE_X11= yes
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_PATCH= yes
+EXTRACT_ONLY= # empty
do-patch: # empty
do-buildlink: # empty
diff -r 3caffe96b58e -r bcca83b15416 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/Mesa/Makefile.common Thu Jan 22 12:58:07 2004 +0000
@@ -1,30 +1,29 @@
-# $NetBSD: Makefile.common,v 1.21 2004/01/20 02:48:33 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/01/22 12:58:07 adam Exp $
+#
-DISTNAME?= MesaLib-${MESA_VERSION}
-CATEGORIES?= graphics
-MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
-EXTRACT_SUFX?= .tar.bz2
+DISTNAME= MesaLib-${MESA_VERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
+WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER?= tech-pkg%NetBSD.org@localhost
-HOMEPAGE?= http://www.mesa3d.org/
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://www.mesa3d.org/
ALL_TARGET= pkgsrc
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+USE_X11= yes
-NO_CONFIGURE?= yes
+NO_CONFIGURE= yes
DIST_SUBDIR= Mesa-${MESA_VERSION}
PATCHDIR?= ${.CURDIR}/../../graphics/MesaLib/patches
DISTINFO_FILE?= ${.CURDIR}/../../graphics/MesaLib/distinfo
pre-install:
- for lib in ${INSTLIBS}; do \
- ${INSTALL_DATA} ${WRKSRC}/lib/$${lib} ${PREFIX}/lib/; \
- cd ${PREFIX}/lib && ${LN} -s $${lib} $${lib%%.[0-9]}; \
- cd ${PREFIX}/lib && ${LN} -s $${lib%%.[0-9]} \
- $${lib%%.[0-9].[0-9]}; \
- ${INSTALL_DATA} ${WRKSRC}/lib/$${lib%%.*}_pic.a \
- ${PREFIX}/lib/; \
+ for lib in ${INSTLIBS}; do \
+ ${LIBTOOL} --mode=install ${INSTALL_DATA} $${lib} ${PREFIX}/lib ; \
done;
.include "../../graphics/Mesa/version.mk"
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/MesaLib/Makefile Thu Jan 22 12:58:07 2004 +0000
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.29 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/22 12:58:19 adam Exp $
+#
-PKGNAME= MesaLib-${MESA_VERSION}
-MAINTAINER= rh%NetBSD.org@localhost
-COMMENT= Graphics library similar to SGI's OpenGL
+PKGNAME= MesaLib-${MESA_VERSION}
+COMMENT= Graphics library similar to SGI's OpenGL
+
+.include "../../graphics/Mesa/Makefile.common"
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "../../graphics/Mesa/Makefile.common"
-
-WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
USE_BUILDLINK3= yes
-USE_X11= yes
-#USE_PKGINSTALL= yes
#CONF_FILES= ${PREFIX}/share/examples/mesa/mesa.conf \
# ${PKG_SYSCONFDIR}/mesa.conf
-INSTLIBS= libGL.so.1.5 libGLw.so.1.0 libOSMesa.so.6.0
+INSTLIBS= ${WRKSRC}/src/mesa/libGL.la \
+ ${WRKSRC}/src/glw/libGLw.la \
+ ${WRKSRC}/src/mesa/libOSMesa.la
.include "../../mk/bsd.prefs.mk"
@@ -25,7 +24,7 @@
.endif
pre-build:
- ${RM} -fr ${WRKSRC}/src/glu
+ cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/GL
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/PLIST
--- a/graphics/MesaLib/PLIST Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/MesaLib/PLIST Thu Jan 22 12:58:07 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/01/20 02:48:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/01/22 12:58:19 adam Exp $
include/GL/gl.h
include/GL/gl_mangle.h
include/GL/glext.h
@@ -9,15 +9,18 @@
include/GL/xmesa.h
include/GL/xmesa_x.h
include/GL/xmesa_xf86.h
-lib/libGL_pic.a
+lib/libGL.a
+lib/libGL.la
lib/libGL.so
lib/libGL.so.1
lib/libGL.so.1.5
-lib/libGLw_pic.a
+lib/libGLw.a
+lib/libGLw.la
lib/libGLw.so
lib/libGLw.so.1
lib/libGLw.so.1.0
-lib/libOSMesa_pic.a
+lib/libOSMesa.a
+lib/libOSMesa.la
lib/libOSMesa.so
lib/libOSMesa.so.6
lib/libOSMesa.so.6.0
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/buildlink2.mk
--- a/graphics/MesaLib/buildlink2.mk Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/MesaLib/buildlink2.mk Thu Jan 22 12:58:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2003/11/23 07:22:10 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2004/01/22 12:58:19 adam Exp $
.if !defined(MESALIB_BUILDLINK2_MK)
MESALIB_BUILDLINK2_MK= # defined
@@ -24,6 +24,7 @@
BUILDLINK_FILES.MesaLib+= include/GL/xmesa_x.h
BUILDLINK_FILES.MesaLib+= include/GL/xmesa_xf86.h
BUILDLINK_FILES.MesaLib+= lib/libGL.*
+BUILDLINK_FILES.MesaLib+= lib/libGLw.*
BUILDLINK_FILES.MesaLib+= lib/libOSMesa.*
USE_X11= # defined
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/MesaLib/distinfo Thu Jan 22 12:58:07 2004 +0000
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.17 2004/01/20 03:46:38 jschauma Exp $
+$NetBSD: distinfo,v 1.18 2004/01/22 12:58:19 adam Exp $
SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c
Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes
SHA1 (Mesa-6.0/MesaDemos-6.0.tar.bz2) = f57a76d0b9b4f70197860eda15f5241a02017a91
Size (Mesa-6.0/MesaDemos-6.0.tar.bz2) = 915060 bytes
SHA1 (patch-aa) = fb0c20f46b1a060d559d7157c991ab1d10aac28a
-SHA1 (patch-ab) = 0426be52c00f40b9a631813d3cbdf2cee47c39cb
+SHA1 (patch-ab) = c1c17e4a752d895a173dd217397b2ce2bcabf915
SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
+SHA1 (patch-ad) = d2857f354c1f42b69b38fbb4d69edb1301e14b65
+SHA1 (patch-ae) = 0cd3971c7d379733811a6033255529e529932146
+SHA1 (patch-af) = dc9b8fd55d6fd31d9ff14897afe21e4447bad129
+SHA1 (patch-ag) = 4efec519cf8ea515af21cd01cd51c866e169ae02
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/patches/patch-ab
--- a/graphics/MesaLib/patches/patch-ab Thu Jan 22 12:56:12 2004 +0000
+++ b/graphics/MesaLib/patches/patch-ab Thu Jan 22 12:58:07 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ab,v 1.10 2004/01/22 12:58:19 adam Exp $
---- Make-config.orig 2004-01-15 09:23:54.000000000 -0500
-+++ Make-config 2004-01-19 18:29:14.000000000 -0500
-@@ -778,19 +778,14 @@
+--- Make-config.orig 2004-01-15 14:23:54.000000000 +0000
++++ Make-config
+@@ -778,19 +778,14 @@ mklinux:
"GLUT_CFLAGS = -fexceptions" \
"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-ad Thu Jan 22 12:58:07 2004 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-ad,v 1.3 2004/01/22 12:58:53 adam Exp $
+
+--- src/mesa/Makefile.X11.orig 2004-01-08 23:39:39.000000000 +0000
++++ src/mesa/Makefile.X11
+@@ -53,10 +53,10 @@ OBJECTS = \
+ ##### RULES #####
+
+ .c.o:
+- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
++ ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+
+ .S.o:
+- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
++ ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+
+
+ # need some special rules here, unfortunately
+@@ -95,19 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$
+
+ # Make the GL library
+ $(LIBDIR)/$(GL_LIB): $(OBJECTS)
+- $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
+- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
+- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
++ ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++ -rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR}
+
+
+ # Make the OSMesa library
+ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
+ if [ ${OSMESA_LIB} ] ; then \
+- $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
+- -minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
+- -l$(GL_LIB_NAME) $(OSMESA_LIB_DEPS) \
+- -install $(LIBDIR) \
+- $(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB:.so=.la} \
++ ${OSMESA_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
++ -version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
+ fi
+
+
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-ae Thu Jan 22 12:58:07 2004 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.3 2004/01/22 12:58:53 adam Exp $
+
+--- src/glw/Makefile.X11.orig 2004-01-22 11:46:07.000000000 +0000
++++ src/glw/Makefile.X11
+@@ -28,7 +28,7 @@ OBJECTS = $(SOURCES:.c=.o)
+ ##### RULES #####
+
+ .c.o:
+- $(CC) -c $(INCDIRS) $(CFLAGS) $<
++ ${LIBTOOL} --mode=compile $(CC) -c $(INCDIRS) $(CFLAGS) $<
+
+
+
+@@ -45,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
+
+ # Make the library
+ $(LIBDIR)/$(GLW_LIB): $(OBJECTS)
+- $(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
+- -patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) \
+- $(MKLIB_OPTIONS) $(OBJECTS)
++ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++ -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
+
+
+ message:
diff -r 3caffe96b58e -r bcca83b15416 graphics/MesaLib/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-af Thu Jan 22 12:58:07 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2004/01/22 12:58:53 adam Exp $
+
+--- src/glu/sgi/Makefile.X11.orig 2004-01-22 12:08:07.000000000 +0000
++++ src/glu/sgi/Makefile.X11
+@@ -119,9 +119,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
+ ##### RULES #####
+
+ .c.o:
++ ${LIBTOOL} --mode=compile \
+ $(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
+
+ .cc.o:
++ ${LIBTOOL} --mode=compile \
+ $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
+
Home |
Main Index |
Thread Index |
Old Index