diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-11-20 07:13:09 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-11-20 07:58:03 +0000 |
| commit | 1d106488bd2115ec60b364ba04c730dde0965eb5 (patch) | |
| tree | d2880b7f41773454d8a0cb5c459fa25cb28a0a55 | |
| parent | 5e8ca8df38ba759065dad3e917b806f5f4523009 (diff) | |
| download | ports-1d106488bd2115ec60b364ba04c730dde0965eb5.tar.gz ports-1d106488bd2115ec60b364ba04c730dde0965eb5.zip | |
graphics/glew-wayland: drop X11 dependency after b44acc9409bdn
libGL is legacy GLX entry point, so maybe missing if libglvnd and/or
mesa-libs was built without X11 support.
$ make clean all deinstall install WITHOUT=X11 -C ../libglvnd
$ make clean all
[...]
===> glew-wayland-2.2.0_2 depends on shared library: libGL.so - not found
*** Error code 1
[...]
ld -shared -soname libGLEW-wayland.so.2 -o lib/libGLEW-wayland.so.2.2.0 tmp/freebsd/default/shared/glew.o -L/usr/local/lib -lEGL -lGL
ld: error: unable to find library -lGL
gmake[1]: *** [Makefile:123: lib/libGLEW-wayland.so.2.2.0] Error 1
| -rw-r--r-- | graphics/glew-wayland/Makefile | 13 | ||||
| -rw-r--r-- | graphics/glew/Makefile | 5 | ||||
| -rw-r--r-- | graphics/glew/distinfo | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/graphics/glew-wayland/Makefile b/graphics/glew-wayland/Makefile index 91d9b00b9bfd..31ff37e6ab5e 100644 --- a/graphics/glew-wayland/Makefile +++ b/graphics/glew-wayland/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= -wayland # https://github.com/nigels-com/glew/issues/172 @@ -8,7 +8,7 @@ MASTERDIR= ${.CURDIR}/../glew PLIST= ${.CURDIR}/pkg-plist PKGMESSAGE= ${.CURDIR}/pkg-message -USE_GL= gl egl +USE_GL= egl opengl USE_XORG= # empty MAKE_ARGS= NAME=${PORTNAME:tu}${PKGNAMESUFFIX} INSTALL_TARGET= install.lib @@ -17,11 +17,10 @@ OPTIONS_DEFINE= # empty post-patch: slave-post-patch slave-post-patch: - @${REINPLACE_CMD} 's/Makefile.$$(SYSTEM)/&-egl/' ${WRKSRC}/Makefile - @${SED} 's/linux/${OPSYS:tl}/' ${WRKSRC}/config/Makefile.linux-egl \ - >${WRKSRC}/config/Makefile.${OPSYS:tl}-egl - @${REINPLACE_CMD} -e '/^Requires:/d' \ - -e '/^Name:/s/${PORTNAME}/${PKGBASE}/' \ + @${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 diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index a89a917fe3cf..f25aa5bc2dec 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -6,6 +6,11 @@ PORTREVISION?= 3 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?= zeising@FreeBSD.org COMMENT= OpenGL Extension Wrangler Library diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo index 97a741f54f32..0f61f19a10a9 100644 --- a/graphics/glew/distinfo +++ b/graphics/glew/distinfo @@ -1,3 +1,7 @@ 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 |