Update to glew 1.7.0, from Brad. Dependencies are happy.

ok phesssler@
2011-11-16 22:42:02 +00:00 · 2011-11-16 22:42:02 +00:00 · 01cbd4d9c0
commit 01cbd4d9c0
parent 77d65d0cfe
6 changed files with 45 additions and 35 deletions
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.7 2011/11/02 08:46:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/11/16 22:42:02 pascal Exp $

 COMMENT=	GL Extension Wrangler library

-DISTNAME=	glew-1.5.6
-REVISION=	0
+DISTNAME=	glew-1.7.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glew/}
 EXTRACT_SUFX=	.tgz

-SHARED_LIBS=	GLEW	3.0
+SHARED_LIBS=	GLEW	4.0 \
+		GLEWmx	0.0

 HOMEPAGE=	http://glew.sourceforge.net/

@ -19,9 +19,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=	GL GLU X11 Xext Xi Xmu c m

 MAKE_ENV=	LIBGLEW_VERSION=${LIBGLEW_VERSION} \
+		LIBGLEWMX_VERSION=${LIBGLEWmx_VERSION} \
 		GLEW_DEST=${PREFIX}
 MAKE_FLAGS=	LD=${CC}

@ -40,10 +42,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/visualinfo ${PREFIX}/bin
 	if [ -f ${WRKSRC}/lib/libGLEW.so.* ]; then \
 	    ${INSTALL_DATA} ${WRKSRC}/lib/libGLEW.so.* ${PREFIX}/lib; \
+	    ${INSTALL_DATA} ${WRKSRC}/lib/libGLEWmx.so.* ${PREFIX}/lib; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/lib/libGLEW.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libGLEWmx.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/include/GL/*.h ${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/glew.pc ${PREFIX}/lib/pkgconfig
+	${INSTALL_DATA} ${WRKSRC}/glewmx.pc ${PREFIX}/lib/pkgconfig
 .for i in css html jpg png
 	${INSTALL_DATA} ${WRKSRC}/doc/*.${i} ${PREFIX}/share/doc/glew
 .endfor
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@ -1,5 +1,5 @@
-MD5 (glew-1.5.6.tgz) = 5vVut2Xx2kiaEyd5Otz2uw==
-RMD160 (glew-1.5.6.tgz) = YwR9fCJwReo3n1KnsOwXkDQ8yyI=
-SHA1 (glew-1.5.6.tgz) = BTNVpBxerPlJLRV9ftpNFGVvjJY=
-SHA256 (glew-1.5.6.tgz) = I/CM7yhr4vJguPKXyfcf35Bqm0Ua0qfRGtH0arPLGGw=
-SIZE (glew-1.5.6.tgz) = 484319
+MD5 (glew-1.7.0.tgz) = +3qLt5GHrJipC1fw8no+hA==
+RMD160 (glew-1.7.0.tgz) = yzhpiTr8u8A0jXaNEVmWxB3PyqA=
+SHA1 (glew-1.7.0.tgz) = kmbyNgwWh6lvLqBkGWcdNwspKNE=
+SHA256 (glew-1.7.0.tgz) = FlOmP7HhpRjEtcy68aYX8aC0wcKdOa5OJYOETZg2XAk=
+SIZE (glew-1.7.0.tgz) = 512582
--- a/graphics/glew/files/Makefile.openbsd
+++ b/graphics/glew/files/Makefile.openbsd
@ -1,10 +1,7 @@
 NAME = $(GLEW_NAME)
 CC ?= cc
 LD ?= cc
-ifneq (undefined, $(origin GLEW_MX))
-CFLAGS.EXTRA = -DGLEW_MX
-endif
-LDFLAGS.SO = -shared
+PICFLAG = -fPIC
 LDFLAGS.EXTRA = -L$(X11BASE)/lib
 LDFLAGS.GL = -lm -lXmu -lXi -lGLU -lGL -lXext -lX11
 LDFLAGS.STATIC = -Wl,-Bstatic
@ -16,4 +13,8 @@ POPT =
 BIN.SUFFIX =
 LIB.SHARED = lib$(NAME).so.$(LIBGLEW_VERSION)
 LIB.STATIC = lib$(NAME).a
-SHARED_OBJ_EXT = so
+LDFLAGS.SO = -shared $(PICFLAG)
+LIB.SHARED.MX = lib$(NAME)mx.so.$(LIBGLEWMX_VERSION)
+LIB.STATIC.MX = lib$(NAME)mx.a
+LDFLAGS.SO.MX = -shared $(PICFLAG)
+SHARED_OBJ_EXT = pic_o
--- a/graphics/glew/patches/patch-Makefile
+++ b/graphics/glew/patches/patch-Makefile
@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.3 2010/04/15 15:02:49 sthen Exp $
--- Makefile.orig	Mon Mar  1 00:09:38 2010
-+++ Makefile	Fri Apr  9 22:35:06 2010
-@@ -64,7 +64,7 @@ else
+$OpenBSD: patch-Makefile,v 1.4 2011/11/16 22:42:02 pascal Exp $
+--- Makefile.orig	Thu Aug 25 10:17:55 2011
+++ Makefile	Fri Nov 11 14:50:20 2011
+@@ -65,7 +65,7 @@ else
 OPT = $(POPT)
 endif
 INCLUDE = -Iinclude
@ -10,27 +10,27 @@ $OpenBSD: patch-Makefile,v 1.3 2010/04/15 15:02:49 sthen Exp $
 
 LIB.SRCS = src/glew.c
 LIB.OBJS = $(LIB.SRCS:.c=.o)
-@@ -89,12 +89,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
- 	$(AR) cr $@ $^
+@@ -101,11 +101,6 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
 
 lib/$(LIB.SHARED): $(LIB.SOBJS)
-	$(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+ 	$(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 -else
 -	$(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
 -	$(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
 -endif
-+	$(LD) $(LDFLAGS.SO) -fPIC -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
 
- bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS) lib/$(LIB.SHARED)
- 	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS)
-@@ -104,6 +99,9 @@ bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJS) lib/$(LI
+ glew.pc: glew.pc.in
+ 	sed \
+@@ -133,11 +128,6 @@ lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
 
- %.o: %.c
- 	$(CC) -c $(CFLAGS) -o $@ $<
-+
-+%.so: %.c
-+	$(CC) -c $(CFLAGS) -fPIC -o $@ $<
+ lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
+ 	$(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
+-else
+-	$(LN) $(LIB.SHARED.MX) lib/$(LIB.SONAME.MX)
+-	$(LN) $(LIB.SHARED.MX) lib/$(LIB.DEVLNK.MX)
+-endif
 
- src/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
- 	$(CC) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ glewmx.pc: glew.pc.in
+ 	sed \
--- a/graphics/glew/pkg/PFRAG.shared
+++ b/graphics/glew/pkg/PFRAG.shared
@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/04/13 23:24:01 sthen Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2011/11/16 22:42:02 pascal Exp $
@lib lib/libGLEW.so.${LIBGLEW_VERSION}
+@lib lib/libGLEWmx.so.${LIBGLEWmx_VERSION}
--- a/graphics/glew/pkg/PLIST
+++ b/graphics/glew/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/04/15 15:02:49 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/11/16 22:42:02 pascal Exp $
 %%SHARED%%
@bin bin/glewinfo
@bin bin/visualinfo
@ -7,11 +7,14 @@ include/GL/glew.h
 include/GL/glxew.h
 include/GL/wglew.h
 lib/libGLEW.a
+lib/libGLEWmx.a
 lib/pkgconfig/
 lib/pkgconfig/glew.pc
+lib/pkgconfig/glewmx.pc
 share/doc/glew/
 share/doc/glew/advanced.html
 share/doc/glew/basic.html
+share/doc/glew/build.html
 share/doc/glew/credits.html
 share/doc/glew/glew.css
 share/doc/glew/glew.html