From nobody Thu Dec 14 16:21:14 2023 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 4Srczb1b3zz52gmk; Thu, 14 Dec 2023 16:21:15 +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 4Srczb15TKz3TvC; Thu, 14 Dec 2023 16:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702570875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iRnrdznjZZL+7Pz0U0yHmOveDI6eFSI14ZqrsM+/bQ=; b=qOLo+bPZChSFfPHNXJ9FKV3fLa9A0wYMAhEorXk6I4r+a1AhF23sPQPa8v8GbSjkgZ7r17 WTwwrJiBUHI5C3rEh9Px/s7fwzbh8Sysk73JhmaDCg7fJJq6VZzX5GqZ5Rcps7tnfcO5VW zeTtQNFxKUp4UDSlAxpgFL2am/L9cgTbPUD1iNR4DXPMPIk/qphKLLyagj5ecT0ZGsUcuu /e5Q1bS1gx5mdYB3D7Rk5dkoODZOQcx8FiFWSY2eEm+lJ6HvwnPEqg2Lmde0ViX1aWj8F2 aO5yI4ckEGKoLDHiSzqKjocOVJVOzwKa0S2ERJBc5KF0sNzNPOZzOhNHic9ukw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702570875; a=rsa-sha256; cv=none; b=oMt9y6JjqJpt/4U2hSOsKK/mc0yq+3m4vVgFUo6FYlUmA+Y2I+9J9+ro/WQfe667Bwso9q jjwHGyMg9mwwpbFm/8JLWyN51MT9I6z0AdEIChCLnIb7Vz7Yk3bVjECuGvhSfOb8S5RkYo 3B702WmpS7t1OwxHchR9IIWprASO/+3OD+JSzJNRlPWDPkLbwj5a6jiMSyT/riRTmwQEXZ slQcSZuSmMPlYk/UdxELzRT184/3HdQtcrJzSHj4mr6BlxVMciaBhnO6MsPA2bb25M13a3 9Pi/jY8MK8qGtVfsePRkVmv4I+lhToD8yFxaUeOElBwGBPj5DiWk1Zfq+PefTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702570875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iRnrdznjZZL+7Pz0U0yHmOveDI6eFSI14ZqrsM+/bQ=; b=vQaWAiMHcXNAaDZ9vbxU7iVcI80FLwfGZJNaSz4/AEnK4+GjAzN7bbUVCRbAEQRz/WWuRo W7G1V62XD7K2LxFHcV0HrFuVo8sbo1GzzbCtyjXjDkGzIvMoD18lhC3QRPN9awy2GT//kJ hCddTqCv5UNPHXLGvcSyyYzSeRaOo3db6jTAJPoywaQhsz4W50INRWrALqFE5AlU5Srukn 9DQB8xIhFASlVzVLWVYBGRmVBOa69+SWLpF8M1XU4IvGNt4Q8EfYHZ6LLvoWI+/ilcswSK riH+j45STOBUKZj9h1XsK0z7TEB1lNIurWi9plYnjPo9mqccDQS0AYsM2X0HFQ== 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 4SrczZ70gnzZTS; Thu, 14 Dec 2023 16:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEGLEhq042382; Thu, 14 Dec 2023 16:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEGLELd042379; Thu, 14 Dec 2023 16:21:14 GMT (envelope-from git) Date: Thu, 14 Dec 2023 16:21:14 GMT Message-Id: <202312141621.3BEGLELd042379@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 0992c4952636 - main - graphics/glfw: Update to 3.3.9 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0992c4952636d55f804b91c45adf3958354bc8de Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=0992c4952636d55f804b91c45adf3958354bc8de commit 0992c4952636d55f804b91c45adf3958354bc8de Author: Nuno Teixeira AuthorDate: 2023-12-14 16:10:33 +0000 Commit: Nuno Teixeira CommitDate: 2023-12-14 16:20:30 +0000 graphics/glfw: Update to 3.3.9 - Use temporary upstream patch to fix WAYLAND build https://github.com/glfw/glfw/issues/2445 ChangeLog: https://github.com/glfw/glfw/releases/tag/3.3.9 --- graphics/glfw/Makefile | 14 +++++++------- graphics/glfw/distinfo | 6 +++--- graphics/glfw/files/patch-evdev-hack | 32 ++++++++++++++++++++++++++++++++ graphics/glfw/files/patch-src-wl_init.c | 26 -------------------------- 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 3904309dd594..21536ec16726 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -1,5 +1,5 @@ PORTNAME= glfw -DISTVERSION= 3.3.8 +DISTVERSION= 3.3.9 CATEGORIES= graphics MASTER_SITES= https://github.com/glfw/glfw/releases/download/${PORTVERSION}/ @@ -10,15 +10,14 @@ WWW= https://www.glfw.org/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= cmake:insource gl localbase zip -USE_GL= glu +USES= cmake:insource localbase zip USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS CONFLICTS_INSTALL= glfw2 -PLIST_SUB= MAJVER="${DISTVERSION:C|\..*||}" \ +PLIST_SUB= MAJVER=${DISTVERSION:R:R} \ VERSION=${DISTVERSION:R} PORTDOCS= * PORTEXAMPLES= * @@ -29,9 +28,10 @@ OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= WAYLAND X11 PLATFORM_DESC= Window creation platform -WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols -WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ - libxkbcommon.so:x11/libxkbcommon +WAYLAND_BUILD_DEPENDS= libxkbcommon>0:x11/libxkbcommon \ + wayland-protocols>=0:graphics/wayland-protocols +WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ + libwayland-egl.so:graphics/wayland WAYLAND_USES= kde:5 pkgconfig WAYLAND_USE= KDE=ecm WAYLAND_CMAKE_BOOL= GLFW_USE_WAYLAND diff --git a/graphics/glfw/distinfo b/graphics/glfw/distinfo index 438e51789ef7..b10a7d9f02ac 100644 --- a/graphics/glfw/distinfo +++ b/graphics/glfw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658499993 -SHA256 (glfw-3.3.8.zip) = 4d025083cc4a3dd1f91ab9b9ba4f5807193823e565a5bcf4be202669d9911ea6 -SIZE (glfw-3.3.8.zip) = 1495490 +TIMESTAMP = 1702569312 +SHA256 (glfw-3.3.9.zip) = 55261410f8c3a9cc47ce8303468a90f40a653cd8f25fb968b12440624fb26d08 +SIZE (glfw-3.3.9.zip) = 1465859 diff --git a/graphics/glfw/files/patch-evdev-hack b/graphics/glfw/files/patch-evdev-hack new file mode 100644 index 000000000000..917c4d581824 --- /dev/null +++ b/graphics/glfw/files/patch-evdev-hack @@ -0,0 +1,32 @@ +Fix build with WAYLAND +https://github.com/glfw/glfw/issues/2445 + +--- src/wl_init.c.orig 2023-12-12 18:00:27 UTC ++++ src/wl_init.c +@@ -32,7 +32,11 @@ + + #include + #include +-#include ++#if defined(__FreeBSD__) ++ #include ++#else ++ #include ++#endif + #include + #include + #include + +--- src/wl_window.c.orig 2023-12-12 18:00:27 UTC ++++ src/wl_window.c +@@ -43,6 +43,10 @@ + #include + #include + ++#if defined(__FreeBSD__) ++ #include ++#endif ++ + #define GLFW_BORDER_SIZE 4 + #define GLFW_CAPTION_HEIGHT 24 + diff --git a/graphics/glfw/files/patch-src-wl_init.c b/graphics/glfw/files/patch-src-wl_init.c deleted file mode 100644 index a4fe12bbdd0a..000000000000 --- a/graphics/glfw/files/patch-src-wl_init.c +++ /dev/null @@ -1,26 +0,0 @@ ---- src/wl_init.c.orig 2019-08-03 17:40:05 UTC -+++ src/wl_init.c -@@ -29,7 +29,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -37,6 +36,15 @@ - #include - #include - #include -+#ifdef __has_include -+#if __has_include() -+#include -+#elif __has_include() -+#include -+#endif -+#else -+#include -+#endif - - - static inline int min(int n1, int n2)