From 349f85231dca3363a491e2e8755895ec05768868 Mon Sep 17 00:00:00 2001 From: Alastair Hogge Date: Tue, 5 Mar 2024 07:43:33 +0800 Subject: [PATCH] devel/sfml: Update to 2.6.1 Update to 2.6.1: - Makefile maintenance - Drop local patch https://www.sfml-dev.org/changelog.php#sfml-2.6.1 PR: 277491 --- devel/sfml/Makefile | 59 +++++++++---------- devel/sfml/distinfo | 6 +- ...tch-src_SFML_Window_Unix_WindowImplX11.cpp | 15 ----- devel/sfml/pkg-plist | 22 +++---- 4 files changed, 43 insertions(+), 59 deletions(-) delete mode 100644 devel/sfml/files/patch-src_SFML_Window_Unix_WindowImplX11.cpp diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index b9d8a264b67f..3f6e3a0207c1 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -1,6 +1,5 @@ PORTNAME= sfml -PORTVERSION= 2.5.1 -PORTREVISION= 4 +PORTVERSION= 2.6.1 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org @@ -10,57 +9,55 @@ WWW= https://www.sfml-dev.org/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.md +USES= cmake compiler:c++11-lang +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= SFML GH_PROJECT= SFML +USE_LDCONFIG= yes -USES= cmake compiler:c++11-lang -USE_CXXSTD= c++14 CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON \ -DSFML_USE_SYSTEM_DEPS=ON -USE_LDCONFIG= yes -DATADIR= ${PREFIX}/share/SFML +DATADIR= ${PREFIX}/share/${PORTNAME:tu} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:tu} 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 EXAMPLES +OPTIONS_DEFAULT= ${OPTIONS_GROUP_MODULES} +OPTIONS_GROUP= MODULES +OPTIONS_GROUP_MODULES= AUDIO GRAPHICS NETWORK WINDOW +OPTIONS_SUB= yes +AUDIO_DESC= SFML Audio module +GRAPHICS_DESC= SFML Graphics module MODULES_DESC= SFML modules +NETWORK_DESC= SFML Network module +WINDOW_DESC= SFML Window module -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 - -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 - -NETWORK_DESC= SFML Network module -NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK - -DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +AUDIO_USES= openal:al +AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO DOXYGEN_IMPLIES= DOCS - +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES +GRAPHICS_IMPLIES= WINDOW +GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2 +GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS +NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK +WINDOW_USES= gl xorg +WINDOW_USE= GL=gl \ + XORG=x11,xcursor,xrandr +WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW post-install: @${RM} ${STAGEDIR}${PREFIX}/*.pc + ${RM} ${STAGEDIR}${DATADIR}/*.md post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/sfml/distinfo b/devel/sfml/distinfo index cb5877ad1ea7..0b859cb2fc3e 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 = 1709547693 +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 -- 2.44.0