diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/glew/Makefile | 12 | ||||
| -rw-r--r-- | graphics/glew/PLIST | 6 | ||||
| -rw-r--r-- | graphics/glew/distinfo | 12 | ||||
| -rw-r--r-- | graphics/glew/patches/patch-ac | 109 | ||||
| -rw-r--r-- | graphics/glew/patches/patch-config_Makefile.linux | 8 |
5 files changed, 37 insertions, 110 deletions
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index 08e7000ea62..5037a744c0f 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2014/02/16 22:45:54 bouyer Exp $ +# $NetBSD: Makefile,v 1.18 2014/11/24 20:06:20 adam Exp $ -DISTNAME= glew-1.10.0 +DISTNAME= glew-1.11.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glew/} EXTRACT_SUFX= .tgz @@ -14,7 +14,6 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake PKGCONFIG_OVERRIDE= glew.pc.in MAKEFLAGS+= CC=${CC:Q} GLEW_DEST=${PREFIX} POPT=${CFLAGS:Q} -MAKEFLAGS+= LDFLAGS.EXTRA=${X11_LDFLAGS:Q} INSTALL_TARGET= install.all INSTALLATION_DIRS+= lib/pkgconfig @@ -26,6 +25,7 @@ MAKEFLAGS+= SYSTEM=solaris-gcc .if ${OPSYS} != "Darwin" .include "../../graphics/MesaLib/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" MAKEFLAGS+= LD=${LD:Q} @@ -33,6 +33,12 @@ MAKEFLAGS+= LD=${LD:Q} MAKEFLAGS+= LD=${CC:Q} .endif +SUBST_CLASSES+= x11path +SUBST_MESSAGE.x11path= Fix X11 path. +SUBST_FILES.x11path= config/Makefile.* +SUBST_STAGE.x11path= pre-configure +SUBST_SED.x11path= -e 's,/usr/X11R[67],${X11BASE},g' + pre-configure: ${LN} -sf Makefile.netbsd ${WRKSRC}/config/Makefile.dragonfly ${LN} -sf Makefile.netbsd ${WRKSRC}/config/Makefile.netbsdelf diff --git a/graphics/glew/PLIST b/graphics/glew/PLIST index 5242d4957a0..ff8542d16d6 100644 --- a/graphics/glew/PLIST +++ b/graphics/glew/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2013/08/04 18:00:52 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2014/11/24 20:06:20 adam Exp $ bin/glewinfo bin/visualinfo include/GL/glew.h @@ -6,11 +6,11 @@ include/GL/glxew.h include/GL/wglew.h lib/libGLEW.a lib/libGLEW.so -lib/libGLEW.so.1.10 +lib/libGLEW.so.1.11 lib/libGLEW.so.${PKGVERSION} lib/libGLEWmx.a lib/libGLEWmx.so -lib/libGLEWmx.so.1.10 +lib/libGLEWmx.so.1.11 lib/libGLEWmx.so.${PKGVERSION} lib/pkgconfig/glew.pc lib/pkgconfig/glewmx.pc diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo index 53d16e74a2e..5bde8431c04 100644 --- a/graphics/glew/distinfo +++ b/graphics/glew/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.16 2013/12/12 10:21:07 markd Exp $ +$NetBSD: distinfo,v 1.17 2014/11/24 20:06:20 adam Exp $ -SHA1 (glew-1.10.0.tgz) = f41b45ca4a630ad1d00b8b87c5f493781a380300 -RMD160 (glew-1.10.0.tgz) = cd9772b37e4f48fe2e25a55303eb89363ce91467 -Size (glew-1.10.0.tgz) = 567605 bytes -SHA1 (patch-ac) = 4de0f7c88dea7410f38ecfd046989a7db412e588 -SHA1 (patch-config_Makefile.linux) = 552bc1e51f8204558698fc63446e905afb72c082 +SHA1 (glew-1.11.0.tgz) = 9bb5c87c055acd122a4956112bbb18ee72c38e5c +RMD160 (glew-1.11.0.tgz) = 28f10f181df1301596f5897ec25f6e8136f108c0 +Size (glew-1.11.0.tgz) = 601430 bytes +SHA1 (patch-ac) = 0b037e6179efd5d0a2e75061b962dead5b7b4328 +SHA1 (patch-config_Makefile.linux) = 49ae0366211065225c944cd0088af6e591f12aa9 diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac index 4d31620d66c..2af25a1b2a9 100644 --- a/graphics/glew/patches/patch-ac +++ b/graphics/glew/patches/patch-ac @@ -1,8 +1,10 @@ -$NetBSD: patch-ac,v 1.10 2013/08/04 18:00:52 adam Exp $ +$NetBSD: patch-ac,v 1.11 2014/11/24 20:06:21 adam Exp $ ---- Makefile.orig 2013-07-22 14:11:22.000000000 +0000 +Use LDFLAGS for linking. + +--- Makefile.orig 2014-08-11 14:14:56.000000000 +0000 +++ Makefile -@@ -105,7 +105,7 @@ ifneq ($(STRIP),) +@@ -110,7 +110,7 @@ ifneq ($(STRIP),) endif lib/$(LIB.SHARED): $(LIB.SOBJS) @@ -11,7 +13,16 @@ $NetBSD: patch-ac,v 1.10 2013/08/04 18:00:52 adam Exp $ ifneq ($(LN),) $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) -@@ -203,13 +203,13 @@ bin: +@@ -151,7 +151,7 @@ lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX) + $(AR) cr $@ $^ + + lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) +- $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) ++ $(LD) $(LDFLAGS) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) + ifneq ($(LN),) + $(LN) $(LIB.SHARED.MX) lib/$(LIB.SONAME.MX) + $(LN) $(LIB.SHARED.MX) lib/$(LIB.DEVLNK.MX) +@@ -210,13 +210,13 @@ bin: mkdir bin bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) @@ -27,93 +38,3 @@ $NetBSD: patch-ac,v 1.10 2013/08/04 18:00:52 adam Exp $ ifneq ($(STRIP),) $(STRIP) -x $@ endif -@@ -231,16 +231,16 @@ install: install.include install.lib - install.mx: install.include install.lib.mx install.pkgconfig.mx - - install.lib: glew.lib -- $(INSTALL) -d -m 0755 $(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) - # runtime - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ - else -- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) -+ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) - endif - - # development files -@@ -248,50 +248,50 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE - $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) -+ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) - endif -- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ - - install.lib.mx: glew.lib.mx -- $(INSTALL) -d -m 0755 $(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) - # runtime - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ - else -- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) -+ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) - endif - # development files - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) -+ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) - endif -- $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(DESTDIR)$(LIBDIR)/ - - install.bin: glew.bin -- $(INSTALL) -d -m 0755 $(BINDIR) -- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(BINDIR)/ - - install.include: -- $(INSTALL) -d -m 0755 $(INCDIR) -- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/ -- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ -- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR) -+ $(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/ - - install.pkgconfig: glew.pc -- $(INSTALL) -d -m 0755 $(LIBDIR) -- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig -- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig -+ $(INSTALL) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ - - install.pkgconfig.mx: glewmx.pc -- $(INSTALL) -d -m 0755 $(LIBDIR) -- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig -- $(INSTALL) -m 0644 glewmx.pc $(LIBDIR)/pkgconfig/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig -+ $(INSTALL) -m 0644 glewmx.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ - - uninstall: - $(RM) $(INCDIR)/wglew.h diff --git a/graphics/glew/patches/patch-config_Makefile.linux b/graphics/glew/patches/patch-config_Makefile.linux index 2c542c3741c..ae7740d4212 100644 --- a/graphics/glew/patches/patch-config_Makefile.linux +++ b/graphics/glew/patches/patch-config_Makefile.linux @@ -1,8 +1,8 @@ -$NetBSD: patch-config_Makefile.linux,v 1.4 2013/12/12 10:21:07 markd Exp $ +$NetBSD: patch-config_Makefile.linux,v 1.5 2014/11/24 20:06:21 adam Exp $ Don't install into $PREFIX/lib64 ---- config/Makefile.linux.orig 2013-07-22 14:11:22.000000000 +0000 +--- config/Makefile.linux.orig 2014-08-11 14:14:56.000000000 +0000 +++ config/Makefile.linux @@ -11,12 +11,12 @@ ifeq (ppc64,${M_ARCH}) endif @@ -14,8 +14,8 @@ Don't install into $PREFIX/lib64 LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib LIBDIR = $(GLEW_DEST)/lib endif --LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 -+LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 -lpthread +-LDFLAGS.GL = -lGL -lX11 ++LDFLAGS.GL = -lGL -lX11 -lpthread LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW |