pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Fix symbol handling in glu. Patch from upstre...
details: https://anonhg.NetBSD.org/pkgsrc/rev/38e794293edc
branches: trunk
changeset: 562892:38e794293edc
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Aug 08 08:25:50 2009 +0000
description:
Fix symbol handling in glu. Patch from upstream via Jörn Clausen
in PR 41613.
Bump glu PKGREVISION.
diffstat:
graphics/MesaLib/distinfo | 4 +-
graphics/MesaLib/patches/patch-ab | 23 +++++++++----
graphics/glu/Makefile | 5 ++-
graphics/glu/files/glu.exports.in | 63 +++++++++++++++++++++++++++++++++++++++
4 files changed, 85 insertions(+), 10 deletions(-)
diffs (150 lines):
diff -r fa1b971541bb -r 38e794293edc graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Sat Aug 08 08:02:45 2009 +0000
+++ b/graphics/MesaLib/distinfo Sat Aug 08 08:25:50 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2009/07/08 20:00:58 hasso Exp $
+$NetBSD: distinfo,v 1.68 2009/08/08 08:25:51 wiz Exp $
SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
@@ -10,7 +10,7 @@
RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
-SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e
+SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee
SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
diff -r fa1b971541bb -r 38e794293edc graphics/MesaLib/patches/patch-ab
--- a/graphics/MesaLib/patches/patch-ab Sat Aug 08 08:02:45 2009 +0000
+++ b/graphics/MesaLib/patches/patch-ab Sat Aug 08 08:25:50 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.17 2009/06/05 11:10:35 wiz Exp $
+$NetBSD: patch-ab,v 1.18 2009/08/08 08:25:51 wiz Exp $
---- src/glu/sgi/Makefile.orig 2008-08-25 17:46:42 +0300
-+++ src/glu/sgi/Makefile 2009-05-17 16:59:39 +0300
+--- src/glu/sgi/Makefile.orig 2008-08-25 14:46:42.000000000 +0000
++++ src/glu/sgi/Makefile
@@ -8,7 +8,8 @@ include $(TOP)/configs/current
GLU_MAJOR = 1
@@ -27,16 +27,25 @@
##### TARGETS #####
-@@ -136,12 +139,11 @@ $(TOP)/$(LIB_DIR):
+@@ -134,14 +137,19 @@ default:
+ $(TOP)/$(LIB_DIR):
+ -mkdir $(TOP)/$(LIB_DIR)
- # Make the library:
- $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+-# Make the library:
+-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
- $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
- -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
- -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
- -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
- $(GLU_LIB_DEPS) $(OBJECTS)
--
++# Make the exports file with the mangled or unmangled names per $CFLAGS
++glu.exports: glu.exports.in
++ $(CC) -E -I $(TOP)/include/GL $(CFLAGS) $< | \
++ awk '/^[^#]+/ {print}' > $@
++
+
++# Make the library:
++$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) glu.exports
+ $(LIBTOOL) --mode=link $(CXX) \
+ -o $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME:.so=.la) $(LDFLAGS) \
+ -rpath $(PREFIX)/lib $(GLU_LIB_DEPS) $(OBJECTS:.o=.lo) \
diff -r fa1b971541bb -r 38e794293edc graphics/glu/Makefile
--- a/graphics/glu/Makefile Sat Aug 08 08:02:45 2009 +0000
+++ b/graphics/glu/Makefile Sat Aug 08 08:25:50 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2009/07/08 20:00:58 hasso Exp $
+# $NetBSD: Makefile,v 1.56 2009/08/08 08:25:50 wiz Exp $
PKGNAME= glu-${MESA_PKGVERSION}
+PKGREVISION= 1
COMMENT= GLU polygon tessellation facility for Mesa
CONFLICTS+= Mesa-glx-[0-9]*
@@ -20,6 +21,8 @@
post-extract:
${GREP} '^[[:cntrl:]][g][l][u]' ${WRKSRC}/src/glu/sgi/glu.def \
| ${SED} -e 's,^[[:cntrl:]],,' > ${WRKSRC}/src/glu/sgi/glu.sym
+ ${RM} ${WRKSRC}/src/glu/sgi/glu.exports
+ ${CP} ${FILESDIR}/glu.exports.in ${WRKSRC}/src/glu/sgi/
pre-build:
cd ${WRKSRC} && ${RM} -fr src/glx src/mesa src/glut src/glw progs
diff -r fa1b971541bb -r 38e794293edc graphics/glu/files/glu.exports.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glu/files/glu.exports.in Sat Aug 08 08:25:50 2009 +0000
@@ -0,0 +1,63 @@
+#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
Home |
Main Index |
Thread Index |
Old Index