Sat Aug 8 08:25:51 2009 UTC ()
Fix symbol handling in glu. Patch from upstream via J旦rn Clausen
in PR 41613.

Bump glu PKGREVISION.


(wiz)
diff -r1.67 -r1.68 pkgsrc/graphics/MesaLib/distinfo
diff -r1.17 -r1.18 pkgsrc/graphics/MesaLib/patches/patch-ab
diff -r1.55 -r1.56 pkgsrc/graphics/glu/Makefile
diff -r0 -r1.1 pkgsrc/graphics/glu/files/glu.exports.in
cvs diff -r1.67 -r1.68 pkgsrc/graphics/MesaLib/distinfo (switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2009/07/08 20:00:58 1.67
+++ pkgsrc/graphics/MesaLib/distinfo 2009/08/08 08:25:51 1.68
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: distinfo,v 1.67 2009/07/08 20:00:58 hasso Exp $ 1$NetBSD: distinfo,v 1.68 2009/08/08 08:25:51 wiz Exp $
2 2
3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe 3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1 4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes 5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes
6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431 6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431
7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176 7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176
8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes 8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes
9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3 9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3
10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes 11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e 13SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393 15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab 16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04 17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7 18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f 19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87 20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4 22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388 23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
25SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 25SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
26SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905 26SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
27SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907 27SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
28SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7 28SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
29SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32 29SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
30SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3 30SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
31SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a 31SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
32SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f 32SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
33SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac 33SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
34SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5 34SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5
35SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477 35SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
36SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394 36SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
cvs diff -r1.17 -r1.18 pkgsrc/graphics/MesaLib/patches/Attic/patch-ab (switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-ab 2009/06/05 11:10:35 1.17
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-ab 2009/08/08 08:25:51 1.18
@@ -1,47 +1,56 @@ @@ -1,47 +1,56 @@
1$NetBSD: patch-ab,v 1.17 2009/06/05 11:10:35 wiz Exp $ 1$NetBSD: patch-ab,v 1.18 2009/08/08 08:25:51 wiz Exp $
2 2
3--- src/glu/sgi/Makefile.orig 2008-08-25 17:46:42 +0300 3--- src/glu/sgi/Makefile.orig 2008-08-25 14:46:42.000000000 +0000
4+++ src/glu/sgi/Makefile 2009-05-17 16:59:39 +0300 4+++ src/glu/sgi/Makefile
5@@ -8,7 +8,8 @@ include $(TOP)/configs/current 5@@ -8,7 +8,8 @@ include $(TOP)/configs/current
6  6
7 GLU_MAJOR = 1 7 GLU_MAJOR = 1
8 GLU_MINOR = 3 8 GLU_MINOR = 3
9-GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) 9-GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
10+GLU_TINY= 0 # What is the point of having such a strange versioning scheme? 10+GLU_TINY= 0 # What is the point of having such a strange versioning scheme?
11+ # It breaks libtool, but I hate to say it: libtool is right! 11+ # It breaks libtool, but I hate to say it: libtool is right!
12  12
13 INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess 13 INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
14  14
15@@ -115,10 +116,12 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) 15@@ -115,10 +116,12 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
16 ##### RULES ##### 16 ##### RULES #####
17  17
18 .c.o: 18 .c.o:
19- $(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ 19- $(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
20+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCDIRS) \ 20+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCDIRS) \
21+ $(CFLAGS) $(COPTS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo) 21+ $(CFLAGS) $(COPTS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo)
22  22
23 .cc.o: 23 .cc.o:
24- $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ 24- $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
25+ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(INCDIRS) \ 25+ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(INCDIRS) \
26+ $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo) 26+ $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo)
27  27
28  28
29 ##### TARGETS ##### 29 ##### TARGETS #####
30@@ -136,12 +139,11 @@ $(TOP)/$(LIB_DIR): 30@@ -134,14 +137,19 @@ default:
 31 $(TOP)/$(LIB_DIR):
 32 -mkdir $(TOP)/$(LIB_DIR)
31  33
32 # Make the library: 34-# Make the library:
33 $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) 35-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
34- $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ 36- $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
35- -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ 37- -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
36- -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ 38- -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
37- -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \ 39- -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
38- $(GLU_LIB_DEPS) $(OBJECTS) 40- $(GLU_LIB_DEPS) $(OBJECTS)
39- 41+# Make the exports file with the mangled or unmangled names per $CFLAGS
 42+glu.exports: glu.exports.in
 43+ $(CC) -E -I $(TOP)/include/GL $(CFLAGS) $< | \
 44+ awk '/^[^#]+/ {print}' > $@
 45+
 46
 47+# Make the library:
 48+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) glu.exports
40+ $(LIBTOOL) --mode=link $(CXX) \ 49+ $(LIBTOOL) --mode=link $(CXX) \
41+ -o $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME:.so=.la) $(LDFLAGS) \ 50+ -o $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME:.so=.la) $(LDFLAGS) \
42+ -rpath $(PREFIX)/lib $(GLU_LIB_DEPS) $(OBJECTS:.o=.lo) \ 51+ -rpath $(PREFIX)/lib $(GLU_LIB_DEPS) $(OBJECTS:.o=.lo) \
43+ -version-info $(GLU_MAJOR):$(GLU_MINOR):$(GLU_TINY) \ 52+ -version-info $(GLU_MAJOR):$(GLU_MINOR):$(GLU_TINY) \
44+ -export-symbols glu.exports 53+ -export-symbols glu.exports
45  54
46 clean: 55 clean:
47 -rm -f *.o */*.o */*/*.o 56 -rm -f *.o */*.o */*/*.o
cvs diff -r1.55 -r1.56 pkgsrc/graphics/glu/Makefile (switch to unified diff)

--- pkgsrc/graphics/glu/Makefile 2009/07/08 20:00:58 1.55
+++ pkgsrc/graphics/glu/Makefile 2009/08/08 08:25:50 1.56
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1# $NetBSD: Makefile,v 1.55 2009/07/08 20:00:58 hasso Exp $ 1# $NetBSD: Makefile,v 1.56 2009/08/08 08:25:50 wiz Exp $
2 2
3PKGNAME= glu-${MESA_PKGVERSION} 3PKGNAME= glu-${MESA_PKGVERSION}
 4PKGREVISION= 1
4COMMENT= GLU polygon tessellation facility for Mesa 5COMMENT= GLU polygon tessellation facility for Mesa
5 6
6CONFLICTS+= Mesa-glx-[0-9]* 7CONFLICTS+= Mesa-glx-[0-9]*
7CONFLICTS+= Mesa<3.2.1 8CONFLICTS+= Mesa<3.2.1
8 9
9MESA_HEADERS= glu.h glu_mangle.h 10MESA_HEADERS= glu.h glu_mangle.h
10 11
11PKGCONFIG_OVERRIDE+= src/glu/glu.pc.in 12PKGCONFIG_OVERRIDE+= src/glu/glu.pc.in
12# no configure stage 13# no configure stage
13PKGCONFIG_OVERRIDE_STAGE= pre-build 14PKGCONFIG_OVERRIDE_STAGE= pre-build
14 15
15.include "../../graphics/Mesa/Makefile.lib" 16.include "../../graphics/Mesa/Makefile.lib"
16 17
17BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION} 18BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
18.include "../../graphics/MesaLib/buildlink3.mk" 19.include "../../graphics/MesaLib/buildlink3.mk"
19 20
20post-extract: 21post-extract:
21 ${GREP} '^[[:cntrl:]][g][l][u]' ${WRKSRC}/src/glu/sgi/glu.def \ 22 ${GREP} '^[[:cntrl:]][g][l][u]' ${WRKSRC}/src/glu/sgi/glu.def \
22 | ${SED} -e 's,^[[:cntrl:]],,' > ${WRKSRC}/src/glu/sgi/glu.sym 23 | ${SED} -e 's,^[[:cntrl:]],,' > ${WRKSRC}/src/glu/sgi/glu.sym
 24 ${RM} ${WRKSRC}/src/glu/sgi/glu.exports
 25 ${CP} ${FILESDIR}/glu.exports.in ${WRKSRC}/src/glu/sgi/
23 26
24pre-build: 27pre-build:
25 cd ${WRKSRC} && ${RM} -fr src/glx src/mesa src/glut src/glw progs 28 cd ${WRKSRC} && ${RM} -fr src/glx src/mesa src/glut src/glw progs
26 29
27# no configure phase 30# no configure phase
28.include "../../mk/configure/pkg-config-override.mk" 31.include "../../mk/configure/pkg-config-override.mk"
29.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/graphics/glu/files/Attic/glu.exports.in
#if defined(USE_MGL_NAMESPACE)
# include "glu_mangle.h" /* mangle function names if needed */
#endif

	gluBeginCurve
	gluBeginPolygon
	gluBeginSurface
	gluBeginTrim
	gluBuild1DMipmapLevels
	gluBuild1DMipmaps
	gluBuild2DMipmapLevels
	gluBuild2DMipmaps
	gluBuild3DMipmapLevels
	gluBuild3DMipmaps
	gluCheckExtension
	gluCylinder
	gluDeleteNurbsRenderer
	gluDeleteQuadric
	gluDeleteTess
	gluDisk
	gluEndCurve
	gluEndPolygon
	gluEndSurface
	gluEndTrim
	gluErrorString
	gluGetNurbsProperty
	gluGetString
	gluGetTessProperty
	gluLoadSamplingMatrices
	gluLookAt
	gluNewNurbsRenderer
	gluNewQuadric
	gluNewTess
	gluNextContour
	gluNurbsCallback
	gluNurbsCallbackData
	gluNurbsCallbackDataEXT
	gluNurbsCurve
	gluNurbsProperty
	gluNurbsSurface
	gluOrtho2D
	gluPartialDisk
	gluPerspective
	gluPickMatrix
	gluProject
	gluPwlCurve
	gluQuadricCallback
	gluQuadricDrawStyle
	gluQuadricNormals
	gluQuadricOrientation
	gluQuadricTexture
	gluScaleImage
	gluSphere
	gluTessBeginContour
	gluTessBeginPolygon
	gluTessCallback
	gluTessEndContour
	gluTessEndPolygon
	gluTessNormal
	gluTessProperty
	gluTessVertex
	gluUnProject
	gluUnProject4