From nobody Mon Jul 22 23:18:00 2024 X-Original-To: dev-commits-ports-main@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 4WSbmT09m2z5QPRn; Mon, 22 Jul 2024 23:18:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSbmS51XCz4s37; Mon, 22 Jul 2024 23:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721690280; 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=KbuG0At3zkVw1GQVFTlYMVlA0WMrYgzFGZ/9fFCD5+Q=; b=gh8m54Dhcl4YQXiaiDdUFPQahiotsI0DIHme4iNf+YJOHq7JyGNkLcx5UkjXPi079lV2Xb wXUJ4pAdLXbb8cHQrHAFjdctnzwlDd7SYira23L+c7wZEzl7g4DqS1nMXOtYpbvzq6tsXy eSGZpDIVBS+GIlWxQR29sPYXDeK/IxkpZRUYPjDrgBsbQkDzQM7HGGO5MciGoVgk1UafCI fwpUgopSxlTpZeHsox4LOXzQyAEA2/BpA/JEvzpqklAYtftpioUcW1At1DTXnZf3LIAdQQ p1PWA2LDP04PRlkOai7VQrjcta4nZAfqhu9l817BKtNKi8MKm9Qoe9jaZodYvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721690280; a=rsa-sha256; cv=none; b=jvCowPG0MA8xBuM91LaTFXkUbQxmi2P2BLFlJQozQbrAfzzW5TfrY50DUf1BxahRXt3bcx r0jCNWl6X+LINPUbFt5TOpAcRA5CeQHzd47z//2WhsXCyT808QqMUf34qyxPAFCnMu42pl WXTqMzifSNOSEMO8gb0577BnesFwnNOKUHrTOZhGVnLe4PqEXgrcZqszuQdTQlgT2/GhCy lLt89r3irBst4/jWx8E7x0l79wnI8MvC1Lx9/TRfHiHlkXv2XknIpmDRtXywkHOWvgBlfl GdeYH1iSbH5PfKWmvDfIBz5JMrUr3mC28RGi+ea6RAtp1fuFQ6MvRIOHjrxjcA== 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=1721690280; 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=KbuG0At3zkVw1GQVFTlYMVlA0WMrYgzFGZ/9fFCD5+Q=; b=EzjXlXWcAX9FDnRYhZf4Z+kMii4YVFrEN+HKfGIP8iZLNy3HdEymRZijnQZ7f//fVZtKH1 0GJA54ToS3vWRP1WTkKd1KMD03IpvyIuomXDzOQ+9ZQIu/SgE44IofQN3PcXa8V9hqHNQS hOayycdMxGyRqufT0boC+C3hxsGa+SoKBpPaGcKolEhvhy3nbm+UT96HlhQKMOUmmJ3prW BB2SN5BUtij4SunNBm2ovGiecK5XNfA79zIEgnn0YpUxJUS1b1uM9TDlP3fZNc8Bes0+9Y gfHPrXat4yCgYwSXVlEU9Y9CSWr8k4IrBeyveapwU4CN3Y+hgT7DWOm3vftCrw== 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 4WSbmS4cxFz148r; Mon, 22 Jul 2024 23:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46MNI0HL082330; Mon, 22 Jul 2024 23:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MNI03H082327; Mon, 22 Jul 2024 23:18:00 GMT (envelope-from git) Date: Mon, 22 Jul 2024 23:18:00 GMT Message-Id: <202407222318.46MNI03H082327@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 7125faf26f5b - main - devel/sfml: update 2.5.1 =?utf-8?Q?=E2=86=92?= 2.6.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7125faf26f5bfbd3c0401987a55b3d80436bda95 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7125faf26f5bfbd3c0401987a55b3d80436bda95 commit 7125faf26f5bfbd3c0401987a55b3d80436bda95 Author: Dmitry Marakasov AuthorDate: 2024-06-10 14:38:10 +0000 Commit: Dmitry Marakasov CommitDate: 2024-07-22 23:13:29 +0000 devel/sfml: update 2.5.1 → 2.6.1 PR: 277491 --- devel/csfml/Makefile | 1 - devel/sfml/Makefile | 71 +++++++++------------- devel/sfml/distinfo | 6 +- .../patch-src_SFML_Window_Unix_WindowImplX11.cpp | 15 ----- devel/sfml/pkg-plist | 22 ++++--- games/emptyepsilon/Makefile | 2 +- 6 files changed, 45 insertions(+), 72 deletions(-) diff --git a/devel/csfml/Makefile b/devel/csfml/Makefile index 7c616cd2eb23..dac6f459fc7e 100644 --- a/devel/csfml/Makefile +++ b/devel/csfml/Makefile @@ -9,7 +9,6 @@ WWW= https://www.sfml-dev.org/download/csfml/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.md -BUILD_DEPENDS= sfml>0:devel/sfml LIB_DEPENDS= libsfml-audio.so:devel/sfml \ libsfml-graphics.so:devel/sfml \ libsfml-network.so:devel/sfml \ diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index b476069572bc..e5d8d24d4540 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -1,72 +1,59 @@ -PORTNAME= sfml -PORTVERSION= 2.5.1 -PORTREVISION= 4 +PORTNAME= SFML +PORTVERSION= 2.6.1 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library -WWW= https://www.sfml-dev.org/ +WWW= https://www.sfml-dev.org/ \ + https://github.com/SFML/SFML LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.md -USE_GITHUB= yes -GH_ACCOUNT= SFML -GH_PROJECT= SFML - USES= cmake compiler:c++11-lang -USE_CXXSTD= c++14 -CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON \ - -DSFML_USE_SYSTEM_DEPS=ON +USE_GITHUB= yes +CMAKE_ON= SFML_USE_SYSTEM_DEPS USE_LDCONFIG= yes CONFLICTS= sfml251 -DATADIR= ${PREFIX}/share/SFML PORTDATA= * PORTDOCS= * -PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS EXAMPLES DOXYGEN -OPTIONS_GROUP= MODULES -OPTIONS_GROUP_MODULES= WINDOW GRAPHICS AUDIO NETWORK -OPTIONS_DEFAULT=${OPTIONS_GROUP_MODULES} -OPTIONS_SUB= yes +OPTIONS_DEFINE= DOCS DOXYGEN +OPTIONS_GROUP= MODULES +OPTIONS_GROUP_MODULES= AUDIO GRAPHICS NETWORK WINDOW +OPTIONS_DEFAULT= ${OPTIONS_GROUP_MODULES} +OPTIONS_SUB= yes -MODULES_DESC= SFML modules - -WINDOW_DESC= SFML Window module -WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW -WINDOW_USES= gl xorg -WINDOW_USE= XORG=x11,xrandr GL=gl - -GRAPHICS_DESC= SFML Graphics module -GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS -GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2 -GRAPHICS_IMPLIES= WINDOW +MODULES_DESC= SFML modules AUDIO_DESC= SFML Audio module -AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO -AUDIO_USES= openal:al AUDIO_LIB_DEPENDS= libFLAC.so:audio/flac \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis +AUDIO_USES= openal:al +AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO -NETWORK_DESC= SFML Network module -NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK - -DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_IMPLIES= DOCS +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC + +GRAPHICS_DESC= SFML Graphics module +GRAPHICS_IMPLIES= WINDOW +GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2 +GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS -EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES +NETWORK_DESC= SFML Network module +NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK -post-install: - @${RM} ${STAGEDIR}${PREFIX}/*.pc +WINDOW_DESC= SFML Window module +WINDOW_USES= gl xorg +WINDOW_USE= GL=gl XORG=x11,xcursor,xrandr +WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/changelog.md ${WRKSRC}/readme.md \ - ${STAGEDIR}${DOCSDIR} + @${RM} ${STAGEDIR}${DOCSDIR}/license.md + ${INSTALL_DATA} ${WRKSRC}/changelog.md ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/sfml/distinfo b/devel/sfml/distinfo index cb5877ad1ea7..96bc007dc613 100644 --- a/devel/sfml/distinfo +++ b/devel/sfml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539702187 -SHA256 (SFML-SFML-2.5.1_GH0.tar.gz) = 438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785 -SIZE (SFML-SFML-2.5.1_GH0.tar.gz) = 22868556 +TIMESTAMP = 1717434619 +SHA256 (SFML-SFML-2.6.1_GH0.tar.gz) = 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d +SIZE (SFML-SFML-2.6.1_GH0.tar.gz) = 25499153 diff --git a/devel/sfml/files/patch-src_SFML_Window_Unix_WindowImplX11.cpp b/devel/sfml/files/patch-src_SFML_Window_Unix_WindowImplX11.cpp deleted file mode 100644 index a7e1715f1b19..000000000000 --- a/devel/sfml/files/patch-src_SFML_Window_Unix_WindowImplX11.cpp +++ /dev/null @@ -1,15 +0,0 @@ -src/SFML/Window/Unix/WindowImplX11.cpp:1278:36: error: reinterpret_cast from 'nullptr_t' to 'void *' is not allowed - reinterpret_cast(NULL)); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ---- src/SFML/Window/Unix/WindowImplX11.cpp.orig 2017-02-08 11:29:16 UTC -+++ src/SFML/Window/Unix/WindowImplX11.cpp -@@ -1275,7 +1275,7 @@ void WindowImplX11::initialize() - m_window, - XNInputStyle, - XIMPreeditNothing | XIMStatusNothing, -- reinterpret_cast(NULL)); -+ static_cast(NULL)); - } - else - { diff --git a/devel/sfml/pkg-plist b/devel/sfml/pkg-plist index bc6ef20291e2..9ea258788869 100644 --- a/devel/sfml/pkg-plist +++ b/devel/sfml/pkg-plist @@ -102,7 +102,9 @@ include/SFML/Window/Mouse.hpp include/SFML/Window/Sensor.hpp include/SFML/Window/Touch.hpp include/SFML/Window/VideoMode.hpp +include/SFML/Window/Vulkan.hpp include/SFML/Window/Window.hpp +include/SFML/Window/WindowBase.hpp include/SFML/Window/WindowHandle.hpp include/SFML/Window/WindowStyle.hpp lib/cmake/SFML/SFMLConfig.cmake @@ -111,20 +113,20 @@ lib/cmake/SFML/SFMLConfigVersion.cmake lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SFML/SFMLSharedTargets.cmake %%AUDIO%%lib/libsfml-audio.so -%%AUDIO%%lib/libsfml-audio.so.2.5 -%%AUDIO%%lib/libsfml-audio.so.2.5.1 +%%AUDIO%%lib/libsfml-audio.so.2.6 +%%AUDIO%%lib/libsfml-audio.so.2.6.1 %%GRAPHICS%%lib/libsfml-graphics.so -%%GRAPHICS%%lib/libsfml-graphics.so.2.5 -%%GRAPHICS%%lib/libsfml-graphics.so.2.5.1 +%%GRAPHICS%%lib/libsfml-graphics.so.2.6 +%%GRAPHICS%%lib/libsfml-graphics.so.2.6.1 %%NETWORK%%lib/libsfml-network.so -%%NETWORK%%lib/libsfml-network.so.2.5 -%%NETWORK%%lib/libsfml-network.so.2.5.1 +%%NETWORK%%lib/libsfml-network.so.2.6 +%%NETWORK%%lib/libsfml-network.so.2.6.1 lib/libsfml-system.so -lib/libsfml-system.so.2.5 -lib/libsfml-system.so.2.5.1 +lib/libsfml-system.so.2.6 +lib/libsfml-system.so.2.6.1 %%WINDOW%%lib/libsfml-window.so -%%WINDOW%%lib/libsfml-window.so.2.5 -%%WINDOW%%lib/libsfml-window.so.2.5.1 +%%WINDOW%%lib/libsfml-window.so.2.6 +%%WINDOW%%lib/libsfml-window.so.2.6.1 libdata/pkgconfig/sfml-all.pc %%AUDIO%%libdata/pkgconfig/sfml-audio.pc %%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc diff --git a/games/emptyepsilon/Makefile b/games/emptyepsilon/Makefile index 931d21175280..8534e71925c9 100644 --- a/games/emptyepsilon/Makefile +++ b/games/emptyepsilon/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE_AngryFly-Royalty-Free-License= ${WRKSRC}/packs/License.txt LICENSE_PERMS_AngryFly-Royalty-Free-License= auto-accept dist-mirror pkg-mirror BUILD_DEPENDS= glm>0:math/glm -LIB_DEPENDS= libsfml-system.so:devel/sfml +LIB_DEPENDS= libsfml-system.so:devel/sfml251 RUN_DEPENDS= xclip:x11/xclip USES= cmake compiler:c++11-lib gl localbase xorg