diff options
| author | grant <grant@pkgsrc.org> | 2005-02-23 13:57:35 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2005-02-23 13:57:35 +0000 |
| commit | 20e453e2c1228625df3bb196d915ba01de4e2c97 (patch) | |
| tree | 926e1771352a387fb0e2ebcabafac531ce376029 /graphics | |
| parent | 12cd809a9dbc8203b19e3e818fc9024ef4af48ff (diff) | |
| download | pkgsrc-20e453e2c1228625df3bb196d915ba01de4e2c97.tar.gz | |
libglut needs symbols from libXi, so explicitly link against it.
fixes unresolved symbols at runtime on Solaris. bump PKGREVISION
of glut.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ag | 10 | ||||
| -rw-r--r-- | graphics/glut/Makefile | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 1725fe16f5c..a637fc6ae16 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2005/01/04 15:49:24 adam Exp $ +$NetBSD: distinfo,v 1.23 2005/02/23 13:57:35 grant Exp $ SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189 Size (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 1627520 bytes @@ -10,5 +10,5 @@ SHA1 (patch-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86 SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8 -SHA1 (patch-ag) = 05673cd2240f1b03139a5a4c57938d58a952b730 +SHA1 (patch-ag) = 696fc3000edbfdba41dd4ebc48b1384e1fda4d04 SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag index 9b5a63ab2dd..41367cdf199 100644 --- a/graphics/MesaLib/patches/patch-ag +++ b/graphics/MesaLib/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.4 2005/01/04 15:49:24 adam Exp $ +$NetBSD: patch-ag,v 1.5 2005/02/23 13:57:35 grant Exp $ ---- src/glut/glx/Makefile.orig 2004-12-05 18:00:20.000000000 +0000 +--- src/glut/glx/Makefile.orig 2004-12-06 05:00:20.000000000 +1100 +++ src/glut/glx/Makefile @@ -79,6 +79,7 @@ OBJECTS = $(SOURCES:.c=.o) ##### RULES ##### @@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.4 2005/01/04 15:49:24 adam Exp $ $(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $< -@@ -90,10 +91,8 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME) +@@ -90,10 +91,10 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) @@ -19,7 +19,9 @@ $NetBSD: patch-ag,v 1.4 2005/01/04 15:49:24 adam Exp $ - -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLUT_LIB_DEPS) $(OBJECTS) + ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ -+ -rpath ${PREFIX}/lib -version-info ${GLUT_MAJOR}:${GLUT_MINOR} ++ -rpath ${PREFIX}/lib \ ++ -L${X11BASE}/lib -rpath ${X11BASE}/lib -lXi \ ++ -version-info ${GLUT_MAJOR}:${GLUT_MINOR} clean: diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index c53f968ba86..42146b029c7 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2005/02/23 13:05:52 grant Exp $ +# $NetBSD: Makefile,v 1.36 2005/02/23 13:57:35 grant Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} +PKGREVISION= 1 COMMENT= GLUT Graphics library similar to SGI's OpenGL CONFLICTS+= Mesa-glx-[0-9]* |