From d5d995bb0df0a37ac91df24fc2d574b20ffdd8c8 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 29 May 2019 17:36:43 +0000 Subject: glew: updated to 2.1.0 GLEW 2.1.0 adds support for OpenGL 4.6, new extensions and minor bug fixes GLEW 2.0.0 adds support for forward-compatible contexts, adds new extensions, OSMesa and EGL support, MX discontinued and minor bug fixes --- graphics/glew/Makefile | 4 +- graphics/glew/PLIST | 9 +--- graphics/glew/distinfo | 18 ++++---- graphics/glew/patches/patch-Makefile | 43 ++++++++++++++++++ graphics/glew/patches/patch-ac | 52 ---------------------- .../glew/patches/patch-config_Makefile.freebsd | 12 ++--- graphics/glew/patches/patch-config_Makefile.netbsd | 12 ++--- .../glew/patches/patch-config_Makefile.openbsd | 12 ++--- 8 files changed, 65 insertions(+), 97 deletions(-) create mode 100644 graphics/glew/patches/patch-Makefile delete mode 100644 graphics/glew/patches/patch-ac (limited to 'graphics') diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index 7ddf184300b..405ed432353 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2018/01/29 12:58:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/29 17:36:43 adam Exp $ -DISTNAME= glew-1.13.0 +DISTNAME= glew-2.1.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glew/} EXTRACT_SUFX= .tgz diff --git a/graphics/glew/PLIST b/graphics/glew/PLIST index 932365a4509..41bb367745a 100644 --- a/graphics/glew/PLIST +++ b/graphics/glew/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2015/08/12 10:52:48 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2019/05/29 17:36:43 adam Exp $ bin/glewinfo bin/visualinfo include/GL/glew.h @@ -6,11 +6,6 @@ include/GL/glxew.h include/GL/wglew.h lib/libGLEW.a lib/libGLEW.so -lib/libGLEW.so.1.13 lib/libGLEW.so.${PKGVERSION} -lib/libGLEWmx.a -lib/libGLEWmx.so -lib/libGLEWmx.so.1.13 -lib/libGLEWmx.so.${PKGVERSION} +lib/libGLEW.so.2.1 lib/pkgconfig/glew.pc -lib/pkgconfig/glewmx.pc diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo index aba2fe718ff..43c5f170ea1 100644 --- a/graphics/glew/distinfo +++ b/graphics/glew/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.24 2016/07/11 16:18:29 jperkin Exp $ +$NetBSD: distinfo,v 1.25 2019/05/29 17:36:43 adam Exp $ -SHA1 (glew-1.13.0.tgz) = d5b1c499f429aa91c466193b4e8ea94a84019e37 -RMD160 (glew-1.13.0.tgz) = 4ed99bea403cbe72d05cfca25694b31209922f9f -SHA512 (glew-1.13.0.tgz) = 8fc8d7c0d2cd9235ea51db9972f492701827bff40642fdb3cc54c10b0737dba8e6d8d0dcd8c5aa5bfaaae39c6198ba3d4292cd1662fbe1977eb9a5d187ba635f -Size (glew-1.13.0.tgz) = 616070 bytes -SHA1 (patch-ac) = a5827450e1ed54fff078da5d2d333a7c14a83660 -SHA1 (patch-config_Makefile.freebsd) = c0db8a34e983db81bbb7dc044155a063022d87d0 +SHA1 (glew-2.1.0.tgz) = 18eca05460d0b61709fc115e632b6fe320718b44 +RMD160 (glew-2.1.0.tgz) = 5eb23369a518f1f88970f8205bd060cd6d56eb8d +SHA512 (glew-2.1.0.tgz) = 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab +Size (glew-2.1.0.tgz) = 764073 bytes +SHA1 (patch-Makefile) = 2700c7dc81a6c4eea837ae649db6d5b1298b364e +SHA1 (patch-config_Makefile.freebsd) = dcfdf2a6bde59529412bff2529d976df6c9bf6a4 SHA1 (patch-config_Makefile.linux) = 49ae0366211065225c944cd0088af6e591f12aa9 -SHA1 (patch-config_Makefile.netbsd) = 2f0d014f4134f3bc1f69130f9c96e902ac788426 -SHA1 (patch-config_Makefile.openbsd) = bcedbcf96351be20be2e66f3472736a5e87c7fb1 +SHA1 (patch-config_Makefile.netbsd) = b7df2081f77ec7df0a6e7727c3ddcb68129e7e9c +SHA1 (patch-config_Makefile.openbsd) = 838a0205c7f93eee35d2655926685d6bbc0a559e diff --git a/graphics/glew/patches/patch-Makefile b/graphics/glew/patches/patch-Makefile new file mode 100644 index 00000000000..b0b59c69127 --- /dev/null +++ b/graphics/glew/patches/patch-Makefile @@ -0,0 +1,43 @@ +$NetBSD: patch-Makefile,v 1.1 2019/05/29 17:36:43 adam Exp $ + +On Darwin, do not put GLU as required lib in glew.pc. +Use LDFLAGS for linking. + +--- Makefile.orig 2017-07-31 11:25:39.000000000 +0000 ++++ Makefile +@@ -48,8 +48,10 @@ INCDIR ?= $(GLEW_DEST)/include/GL + PKGDIR ?= $(GLEW_DEST)/lib/pkgconfig + + ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU) ++ifneq ($(SYSTEM), darwin) + LIBGLU = glu + endif ++endif + + DIST_NAME ?= glew-$(GLEW_VERSION) + DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip +@@ -119,7 +121,7 @@ ifneq ($(STRIP),) + endif + + lib/$(LIB.SHARED): $(LIB.SOBJS) +- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) ++ $(CC) $(LDFLAGS) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) + ifneq ($(LN),) + $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) + $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) +@@ -178,13 +180,13 @@ bin: + mkdir bin + + bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif + + bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac deleted file mode 100644 index 65948bb9ac5..00000000000 --- a/graphics/glew/patches/patch-ac +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ac,v 1.14 2016/07/07 14:59:37 jperkin Exp $ - -On Darwin, do not put GLU as required lib in glew.pc. -Use LDFLAGS for linking. - ---- Makefile.orig 2015-08-10 11:47:22.000000000 +0000 -+++ Makefile -@@ -47,8 +47,10 @@ LIBDIR ?= $(GLEW_DEST)/lib - INCDIR ?= $(GLEW_DEST)/include/GL - - ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU) -+ifneq ($(SYSTEM), darwin) - LIBGLU = glu - endif -+endif - - DIST_NAME ?= glew-$(GLEW_VERSION) - DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip -@@ -115,7 +117,7 @@ ifneq ($(STRIP),) - endif - - lib/$(LIB.SHARED): $(LIB.SOBJS) -- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) -+ $(CC) $(LDFLAGS) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) - ifneq ($(LN),) - $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) - $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) -@@ -163,7 +165,7 @@ ifneq ($(STRIP),) - endif - - lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) -- $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) -+ $(CC) $(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) -@@ -222,13 +224,13 @@ bin: - mkdir bin - - bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) -- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) - ifneq ($(STRIP),) - $(STRIP) -x $@ - endif - - bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED) -- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) - ifneq ($(STRIP),) - $(STRIP) -x $@ - endif diff --git a/graphics/glew/patches/patch-config_Makefile.freebsd b/graphics/glew/patches/patch-config_Makefile.freebsd index 2e45aa24d0c..8b793d83586 100644 --- a/graphics/glew/patches/patch-config_Makefile.freebsd +++ b/graphics/glew/patches/patch-config_Makefile.freebsd @@ -1,18 +1,12 @@ -$NetBSD: patch-config_Makefile.freebsd,v 1.3 2016/07/11 16:18:29 jperkin Exp $ +$NetBSD: patch-config_Makefile.freebsd,v 1.4 2019/05/29 17:36:43 adam Exp $ Allow linking with CC. ---- config/Makefile.freebsd.orig 2015-08-10 11:47:22.000000000 +0000 +--- config/Makefile.freebsd.orig 2017-07-31 11:25:39.000000000 +0000 +++ config/Makefile.freebsd -@@ -14,9 +14,9 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR +@@ -14,4 +14,4 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a -LDFLAGS.SO = -shared -soname $(LIB.SONAME) +LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) - LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) - LIB.DEVLNK.MX = lib$(NAME)mx.so - LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) - LIB.STATIC.MX = lib$(NAME)mx.a --LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) -+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) diff --git a/graphics/glew/patches/patch-config_Makefile.netbsd b/graphics/glew/patches/patch-config_Makefile.netbsd index 5fb96553921..27b55629392 100644 --- a/graphics/glew/patches/patch-config_Makefile.netbsd +++ b/graphics/glew/patches/patch-config_Makefile.netbsd @@ -1,18 +1,12 @@ -$NetBSD: patch-config_Makefile.netbsd,v 1.1 2016/07/11 16:18:29 jperkin Exp $ +$NetBSD: patch-config_Makefile.netbsd,v 1.2 2019/05/29 17:36:43 adam Exp $ Allow linking with CC. ---- config/Makefile.netbsd.orig 2015-08-10 11:47:22.000000000 +0000 +--- config/Makefile.netbsd.orig 2017-07-31 11:25:39.000000000 +0000 +++ config/Makefile.netbsd -@@ -14,9 +14,9 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR +@@ -14,4 +14,4 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a -LDFLAGS.SO = -shared -soname $(LIB.SONAME) +LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) - LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) - LIB.DEVLNK.MX = lib$(NAME)mx.so - LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) - LIB.STATIC.MX = lib$(NAME)mx.a --LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) -+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) diff --git a/graphics/glew/patches/patch-config_Makefile.openbsd b/graphics/glew/patches/patch-config_Makefile.openbsd index 4bcb7425348..21dfbafbd89 100644 --- a/graphics/glew/patches/patch-config_Makefile.openbsd +++ b/graphics/glew/patches/patch-config_Makefile.openbsd @@ -1,18 +1,12 @@ -$NetBSD: patch-config_Makefile.openbsd,v 1.1 2016/07/11 16:18:29 jperkin Exp $ +$NetBSD: patch-config_Makefile.openbsd,v 1.2 2019/05/29 17:36:43 adam Exp $ Allow linking with CC. ---- config/Makefile.openbsd.orig 2015-08-10 11:47:22.000000000 +0000 +--- config/Makefile.openbsd.orig 2017-07-31 11:25:39.000000000 +0000 +++ config/Makefile.openbsd -@@ -14,9 +14,9 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR +@@ -14,4 +14,4 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a -LDFLAGS.SO = -shared -soname $(LIB.SONAME) +LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) - LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) - LIB.DEVLNK.MX = lib$(NAME)mx.so - LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) - LIB.STATIC.MX = lib$(NAME)mx.a --LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) -+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) -- cgit v1.2.3