From nobody Sat Nov 20 07:58:46 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0A673188D3C9; Sat, 20 Nov 2021 07:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hx5Wp6Qxvz3plR; Sat, 20 Nov 2021 07:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD483186D3; Sat, 20 Nov 2021 07:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AK7wkJk023147; Sat, 20 Nov 2021 07:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AK7wkuD023146; Sat, 20 Nov 2021 07:58:46 GMT (envelope-from git) Date: Sat, 20 Nov 2021 07:58:46 GMT Message-Id: <202111200758.1AK7wkuD023146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1d106488bd21 - main - graphics/glew-wayland: drop X11 dependency after b44acc9409bdn List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d106488bd2115ec60b364ba04c730dde0965eb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d106488bd2115ec60b364ba04c730dde0965eb5 commit 1d106488bd2115ec60b364ba04c730dde0965eb5 Author: Jan Beich AuthorDate: 2021-11-20 07:13:09 +0000 Commit: Jan Beich CommitDate: 2021-11-20 07:58:03 +0000 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 --- graphics/glew-wayland/Makefile | 13 ++++++------- graphics/glew/Makefile | 5 +++++ 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