diff options
author | adam <adam> | 2011-07-13 19:47:38 +0000 |
---|---|---|
committer | adam <adam> | 2011-07-13 19:47:38 +0000 |
commit | 7d244f06c2e4ea37a36d0611ea85223199da718e (patch) | |
tree | e70938d544be07f31069ae92c0e6985be6b50822 /graphics | |
parent | 2c7b71a24e1f526e551107a1b71dfea845e7e01a (diff) | |
download | pkgsrc-7d244f06c2e4ea37a36d0611ea85223199da718e.tar.gz |
Changes 1.6.0:
New extensions:
* GL_AMD_blend_minmax_factor
* GL_AMD_sample_positions
* GL_EXT_x11_sync_object
* GL_NV_texture_multisample
* GL_NV_video_capture
* GLX_NV_video_capture
* WGL_NV_DX_interop
* WGL_NV_video_capture
Bug fixes:
* Define GLEW_NO_GLU for no glu dependency.
* mx suffix for GLEW MX libraries, build both libraries by default.
* Cygwin build improvements
* Soname of GLEWmx shared libraries
* Query GL extension string only once
* GLX_OML_sync_control no longer requires C99
* glDraw*InstancedARB moved from GL_ARB_draw_instanced to
GL_ARB_instanced_arrays
* glFramebufferTextureLayerEXT moved from GL_EXT_geometry_shader4 to
GL_EXT_texture_array
* Fixes for BSD build
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/glew/Makefile | 5 | ||||
-rw-r--r-- | graphics/glew/PLIST | 9 | ||||
-rw-r--r-- | graphics/glew/distinfo | 12 | ||||
-rw-r--r-- | graphics/glew/patches/patch-ac | 98 | ||||
-rw-r--r-- | graphics/glew/patches/patch-ad | 10 |
5 files changed, 91 insertions, 43 deletions
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index 633c596b5c1..68ae4b1fad0 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2011/02/24 11:06:31 adam Exp $ +# $NetBSD: Makefile,v 1.12 2011/07/13 19:47:38 adam Exp $ -DISTNAME= glew-1.5.8 +DISTNAME= glew-1.6.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glew/} EXTRACT_SUFX= .tgz @@ -17,6 +17,7 @@ USE_TOOLS+= gmake PKGCONFIG_OVERRIDE= glew.pc.in MAKE_ENV+= GLEW_DEST=${PREFIX} X11=${PREFIX} POPT=${CFLAGS:Q} MAKE_ENV+= LDFLAGS.EXTRA=${X11_LDFLAGS:Q} +INSTALL_TARGET= install.all INSTALLATION_DIRS+= lib/pkgconfig post-patch: diff --git a/graphics/glew/PLIST b/graphics/glew/PLIST index 4eba89894c7..62b3921df0c 100644 --- a/graphics/glew/PLIST +++ b/graphics/glew/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2010/11/10 20:22:54 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2011/07/13 19:47:38 adam Exp $ bin/glewinfo bin/visualinfo include/GL/glew.h @@ -6,6 +6,11 @@ include/GL/glxew.h include/GL/wglew.h lib/libGLEW.a lib/libGLEW.so -lib/libGLEW.so.1.5 +lib/libGLEW.so.1.6 lib/libGLEW.so.${PKGVERSION} +lib/libGLEWmx.a +lib/libGLEWmx.so +lib/libGLEWmx.so.1.6 +lib/libGLEWmx.so.${PKGVERSION} lib/pkgconfig/glew.pc +lib/pkgconfig/glewmx.pc diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo index 3b4b7caec6d..9effe442d11 100644 --- a/graphics/glew/distinfo +++ b/graphics/glew/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2011/02/24 11:06:31 adam Exp $ +$NetBSD: distinfo,v 1.11 2011/07/13 19:47:38 adam Exp $ -SHA1 (glew-1.5.8.tgz) = 450946935faa20ac4950cb42ff025be2c1f7c22e -RMD160 (glew-1.5.8.tgz) = b66121f3475ddf72be6b9e9ce082c3a6c9e14820 -Size (glew-1.5.8.tgz) = 487073 bytes +SHA1 (glew-1.6.0.tgz) = ed555d15d0f01239b262c4cf803e97d60d8a18b6 +RMD160 (glew-1.6.0.tgz) = 5b896cb9bf3b2058cc6a5e167d64bae04b46eb6c +Size (glew-1.6.0.tgz) = 494713 bytes SHA1 (patch-aa) = 8f1d6f48e26f8ce13282b676ac18ac49f596ae9b -SHA1 (patch-ac) = c6f8029b71988cb415d7beef0886b2288dabe703 -SHA1 (patch-ad) = 5d5245a32c5e03177c55fc438b8339c8203179b1 +SHA1 (patch-ac) = f071608a22b201575f009fb8a257d27deab2c8fc +SHA1 (patch-ad) = 0801264561feb144179f7e6904080873529890ff diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac index c88ffe4625e..523503e2ea9 100644 --- a/graphics/glew/patches/patch-ac +++ b/graphics/glew/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ +$NetBSD: patch-ac,v 1.8 2011/07/13 19:47:38 adam Exp $ ---- Makefile.orig 2010-11-03 20:55:35.000000000 +0000 +--- Makefile.orig 2011-04-27 16:16:35.000000000 +0000 +++ Makefile -@@ -89,7 +89,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) +@@ -100,7 +100,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) $(AR) cr $@ $^ lib/$(LIB.SHARED): $(LIB.SOBJS) @@ -11,8 +11,8 @@ $NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) else $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) -@@ -97,10 +97,10 @@ else - endif +@@ -164,10 +164,10 @@ bin: + glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS) lib/$(LIB.SHARED) - $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS) @@ -22,24 +22,19 @@ $NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ - $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) - %.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< -@@ -122,33 +122,31 @@ glew.pc: glew.pc.in + # Install targets - install: all - # directories -- $(INSTALL) -d -m 0755 $(BINDIR) -- $(INSTALL) -d -m 0755 $(INCDIR) +@@ -178,66 +178,62 @@ 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 $(LIBDIR)/pkgconfig -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR) + $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ + $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ else - $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ @@ -48,26 +43,73 @@ $NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ + $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) endif # development files -- $(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) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ -+ $(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) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ else +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) + endif - $(STRIP) -x lib/$(LIB.STATIC) - $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ -- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) + $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ -+ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) + + 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) + $(STRIP) -x lib/$(LIB.SHARED.MX) + $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ + else +- $(STRIP) -x lib/$(LIB.SHARED.MX) +- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/ ++ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) endif - # utilities + # development files + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ + else +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) ++ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) + endif +- $(STRIP) -x lib/$(LIB.STATIC.MX) +- $(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-ad b/graphics/glew/patches/patch-ad index 37a1396ff3e..71d20081680 100644 --- a/graphics/glew/patches/patch-ad +++ b/graphics/glew/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.2 2010/10/30 19:20:49 adam Exp $ +$NetBSD: patch-ad,v 1.3 2011/07/13 19:47:38 adam Exp $ ---- config/Makefile.darwin.orig 2009-08-31 11:41:51.000000000 +0200 +--- config/Makefile.darwin.orig 2011-04-27 16:16:34.000000000 +0000 +++ config/Makefile.darwin -@@ -17,7 +17,7 @@ endif +@@ -13,7 +13,7 @@ endif LDFLAGS.STATIC = LDFLAGS.DYNAMIC = WARN = -Wall -W -POPT = -O2 +POPT ?= -O2 BIN.SUFFIX = - LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib - LIB.DEVLNK = lib$(NAME).dylib + LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib + LIB.DEVLNK = lib$(NAME).dylib |