1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00

devel/sfml: update 2.5.1 → 2.6.1

PR:		277491
This commit is contained in:
Dmitry Marakasov 2024-06-10 17:38:10 +03:00
parent a49cde69ae
commit 7125faf26f
6 changed files with 45 additions and 72 deletions

View File

@ -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 \

View File

@ -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
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
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
EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES
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 <bsd.port.mk>

View File

@ -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

View File

@ -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<void*>(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<void*>(NULL));
+ static_cast<void*>(NULL));
}
else
{

View File

@ -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

View File

@ -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