diff --git a/graphics/glew-wayland/Makefile b/graphics/glew-wayland/Makefile index 67821b95362e..6ba5b4fd0b5e 100644 --- a/graphics/glew-wayland/Makefile +++ b/graphics/glew-wayland/Makefile @@ -1,41 +1,41 @@ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -wayland # https://github.com/nigels-com/glew/issues/172 MAINTAINER= jbeich@FreeBSD.org MASTERDIR= ${.CURDIR}/../glew PLIST= ${.CURDIR}/pkg-plist PKGMESSAGE= ${.CURDIR}/pkg-message USE_GL= egl opengl USE_XORG= # empty MAKE_ARGS= NAME=${PORTNAME:tu}${PKGNAMESUFFIX} INSTALL_TARGET= install.lib OPTIONS_DEFINE= # empty post-patch: slave-post-patch slave-post-patch: @${REINPLACE_CMD} 's/Makefile.$$(SYSTEM)/&-egl-glvnd/' ${WRKSRC}/Makefile @${SED} 's/linux/${OPSYS:tl}/' ${WRKSRC}/config/Makefile.linux-egl-glvnd \ >${WRKSRC}/config/Makefile.${OPSYS:tl}-egl-glvnd @${REINPLACE_CMD} -e '/^Name:/s/${PORTNAME}/${PKGBASE}/' \ ${WRKSRC}/${PORTNAME}.pc.in # GCC 4.2 doesn't support redefining same typedef @${REINPLACE_CMD} '/typedef.*EGLint;/d' ${WRKSRC}/include/GL/eglew.h post-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/glewinfo \ ${STAGEDIR}${PREFIX}/bin/glewinfo${PKGNAMESUFFIX} ${INSTALL_PROGRAM} ${WRKSRC}/bin/visualinfo \ ${STAGEDIR}${PREFIX}/bin/visualinfo${PKGNAMESUFFIX} ${MKDIR} ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/include/GL/eglew.h \ ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/${PKGBASE}.pc .include "${MASTERDIR}/Makefile" CATEGORIES+= wayland diff --git a/graphics/glew-wayland/pkg-plist b/graphics/glew-wayland/pkg-plist index a77a3b8c0afb..923b02f68b2b 100644 --- a/graphics/glew-wayland/pkg-plist +++ b/graphics/glew-wayland/pkg-plist @@ -1,8 +1,8 @@ bin/glewinfo-wayland bin/visualinfo-wayland include/GL/eglew.h lib/libGLEW-wayland.a lib/libGLEW-wayland.so lib/libGLEW-wayland.so.2 -lib/libGLEW-wayland.so.2.2.0 +lib/libGLEW-wayland.so.2.3.1 libdata/pkgconfig/glew-wayland.pc diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index 01288b358686..d0e7b1a9c880 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -1,41 +1,36 @@ PORTNAME= glew -PORTVERSION= 2.2.0 -PORTREVISION?= 3 +PORTVERSION= 2.3.1 +PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF -# Keep glew-wayland patches here to avoid version desync in distinfo -PATCH_SITES= https://github.com/nigels-com/${PORTNAME}/commit/ -PATCHFILES+= 8e2e31e69bb6.patch:-p1 # https://github.com/nigels-com/glew/pull/329 -PATCHFILES+= 062067f2bad8.patch:-p1 # https://github.com/nigels-com/glew/pull/330 - MAINTAINER?= x11@FreeBSD.org COMMENT= OpenGL Extension Wrangler Library WWW= https://glew.sourceforge.net/ LICENSE= MIT BSD3CLAUSE LICENSE_COMB= dual USES= gmake gl tar:tgz xorg USE_XORG?= x11 USE_GL?= gl glu USE_LDCONFIG= yes MAKE_ENV= GLEW_DEST=${PREFIX} GLEW_PREFIX=${PREFIX} INSTALL_TARGET?=install.all OPTIONS_DEFINE?=DOCS post-patch: @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|' \ -e 's|^LIBDIR|GLEW_LIBDIR|' \ -e 's|$$(LIBDIR)|$$(GLEW_LIBDIR)|' \ ${WRKSRC}/Makefile do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in css html jpg png ${INSTALL_DATA} ${WRKSRC}/doc/*.${i} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo index 0f61f19a10a9..8d900c7bb48a 100644 --- a/graphics/glew/distinfo +++ b/graphics/glew/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1584273239 -SHA256 (glew-2.2.0.tgz) = d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1 -SIZE (glew-2.2.0.tgz) = 835861 -SHA256 (8e2e31e69bb6.patch) = 27bfa5fd5047603d179ef0fe46601eb10fb3fb522b9736a5f10fc33ea9b5ec04 -SIZE (8e2e31e69bb6.patch) = 668 -SHA256 (062067f2bad8.patch) = 7dc10ff7464e1bcef7bf82c3f3e09f16317ec6b0f3936c1a3079dc1efcd68190 -SIZE (062067f2bad8.patch) = 607 +TIMESTAMP = 1783945884 +SHA256 (glew-2.3.1.tgz) = b64790f94b926acd7e8f84c5d6000a86cb43967bd1e688b03089079799c9e889 +SIZE (glew-2.3.1.tgz) = 866060 diff --git a/graphics/glew/files/patch-Makefile b/graphics/glew/files/patch-Makefile index 0c1bb95f8167..53a7bfec4e22 100644 --- a/graphics/glew/files/patch-Makefile +++ b/graphics/glew/files/patch-Makefile @@ -1,74 +1,64 @@ ---- Makefile.orig 2020-03-15 11:53:59 UTC +--- Makefile.orig 2026-01-23 23:00:13 UTC +++ Makefile -@@ -116,7 +116,7 @@ else ifneq ($(LIBTOOL),) +@@ -116,7 +116,7 @@ ifneq ($(STRIP),) $(LIBTOOL) $@ $^ endif ifneq ($(STRIP),) - $(STRIP) -x $@ + $(STRIP) $@ endif $(LIB.SHARED.DIR)/$(LIB.SHARED): $(LIB.SOBJS) -@@ -126,8 +126,9 @@ ifneq ($(LN),) +@@ -126,8 +126,9 @@ ifneq ($(STRIP),) $(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.DEVLNK) endif ifneq ($(STRIP),) - $(STRIP) -x $@ + $(STRIP) $@ endif + /usr/bin/file $@ tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h @mkdir -p $(dir $@) -@@ -143,15 +144,15 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c includ +@@ -143,15 +144,15 @@ glew.pc: glew.pc.in glew.pc: glew.pc.in sed \ - -e "s|@prefix@|$(GLEW_PREFIX)|g" \ - -e "s|@libdir@|$(LIBDIR)|g" \ - -e "s|@exec_prefix@|$(BINDIR)|g" \ - -e "s|@includedir@|$(INCDIR)|g" \ - -e "s|@version@|$(GLEW_VERSION)|g" \ - -e "s|@cflags@||g" \ - -e "s|@libname@|$(NAME)|g" \ - -e "s|@libgl@|$(LDFLAGS.GL)|g" \ - -e "s|@requireslib@|$(LIBGLU)|g" \ + -e 's|@prefix@|$(GLEW_PREFIX)|g' \ + -e 's|@libdir@|$${prefix}/lib|g' \ + -e 's|@exec_prefix@|$${prefix}/bin|g' \ + -e 's|@includedir@|$${prefix}/include|g' \ + -e 's|@version@|$(GLEW_VERSION)|g' \ + -e 's|@cflags@||g' \ + -e 's|@libname@|$(NAME)|g' \ + -e 's|@libgl@|$(LDFLAGS.GL)|g' \ + -e 's|@requireslib@|$(LIBGLU)|g' \ < $< > $@ # GLEW utility programs -@@ -182,22 +183,22 @@ bin: - bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) +@@ -180,14 +181,14 @@ ifneq ($(STRIP),) + @mkdir -p $(dir $@) $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) ifneq ($(STRIP),) - $(STRIP) -x $@ + $(STRIP) $@ endif bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) + @mkdir -p $(dir $@) $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) ifneq ($(STRIP),) - $(STRIP) -x $@ + $(STRIP) $@ endif $(GLEWINFO.BIN.OBJ): $(GLEWINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h - @mkdir -p $(dir $@) -- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< -+ $(CC) -DGLEW_NO_GLU $(CFLAGS) -o $@ -c $< - - $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h - @mkdir -p $(dir $@) -- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< -+ $(CC) -DGLEW_NO_GLU $(CFLAGS) -o $@ -c $< - - # Install targets - diff --git a/graphics/glew/pkg-plist b/graphics/glew/pkg-plist index 4bb9319a5135..17ec29bbaa90 100644 --- a/graphics/glew/pkg-plist +++ b/graphics/glew/pkg-plist @@ -1,26 +1,27 @@ bin/glewinfo bin/visualinfo +@comment include/GL/eglew.h include/GL/glew.h include/GL/glxew.h include/GL/wglew.h lib/libGLEW.a lib/libGLEW.so lib/libGLEW.so.2 -lib/libGLEW.so.2.2.0 +lib/libGLEW.so.2.3.1 libdata/pkgconfig/glew.pc %%PORTDOCS%%%%DOCSDIR%%/advanced.html %%PORTDOCS%%%%DOCSDIR%%/basic.html %%PORTDOCS%%%%DOCSDIR%%/build.html %%PORTDOCS%%%%DOCSDIR%%/credits.html +@comment %%PORTDOCS%%%%DOCSDIR%%/eglew.html %%PORTDOCS%%%%DOCSDIR%%/github.png %%PORTDOCS%%%%DOCSDIR%%/glew.css %%PORTDOCS%%%%DOCSDIR%%/glew.html %%PORTDOCS%%%%DOCSDIR%%/glew.png %%PORTDOCS%%%%DOCSDIR%%/glxew.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/install.html %%PORTDOCS%%%%DOCSDIR%%/log.html %%PORTDOCS%%%%DOCSDIR%%/new.png %%PORTDOCS%%%%DOCSDIR%%/ogl_sm.jpg -%%PORTDOCS%%%%DOCSDIR%%/travis.png %%PORTDOCS%%%%DOCSDIR%%/wglew.html