Attachment #249104 for bug #277491




PORTNAME=	SFML
PORTVERSION=	2.6.1
PORTREVISION=	4
CATEGORIES=	devel

MAINTAINER=	amdmi3@FreeBSD.org
COMMENT=	Simple and Fast Multimedia Library
WWW=		https://www.sfml-dev.org/

LICENSE=	CC0-1.0 ZLIB
LICENSE_COMB=	multi
LICENSE_FILE=	${WRKSRC}/license.md

USE_GITHUB=	yes
GH_ACCOUNT=	SFML
GH_PROJECT=	SFML

USES=		cmake compiler:c++11-lang
USE_CXXSTD=	c++14
USE_GITHUB=	yes
		-DSFML_USE_SYSTEM_DEPS=ON
USE_LDCONFIG=	yes

CMAKE_ARGS=	-DSFML_USE_SYSTEM_DEPS=ON

EXTRACT_AFTER_ARGS=	${_DIST_EXCLUDES:S,^,--exclude ,}

PORTDATA=	*
PORTDOCS=	*
PORTEXAMPLES=	*

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
AUDIO_USES=		openal:al
AUDIO_CMAKE_BOOL=	SFML_BUILD_AUDIO
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
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

_DIST_EXCLUDES=		examples/android examples/assets examples/cocoa \
			examples/win32
_EXAMPLES_ASSETS=	-type f -not -name '*.bak' -not -name '*.cpp' -not \
			-name '*.h' -not -name '*.hpp' -not -name '*.orig' -not \
			-name CMakeLists.txt
_EXAMPLES_PROGRAM=	-depth 2 -type f -and -not -type d -and -not -name \
			CMakeFiles -perm -o=+x
_EXAMPLES_SOURCE=	"-not -name *.bak -not -name *.orig -not -name asset_licenses.md -not -name CMakeLists.txt -not -regex .*resources.*"

post-patch:
	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
		${WRKSRC}/examples/island/Island.cpp \
		${WRKSRC}/examples/joystick/Joystick.cpp \
		${WRKSRC}/examples/opengl/OpenGL.cpp \
		${WRKSRC}/examples/shader/Shader.cpp \
		${WRKSRC}/examples/sound/Sound.cpp \
		${WRKSRC}/examples/tennis/Tennis.cpp \
		${WRKSRC}/examples/vulkan/Vulkan.cpp

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/changelog.md ${WRKSRC}/readme.md \
		${STAGEDIR}${DOCSDIR}

post-install-EXAMPLES-on:
	${MKDIR} ${STAGEDIR}${DATADIR}/resources
	${FIND} ${WRKSRC}/examples ${_EXAMPLES_ASSETS} -execdir ${INSTALL_DATA} \
		{} ${STAGEDIR}${DATADIR}/resources/{} \;
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	(cd ${WRKSRC}/examples && \
		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${_EXAMPLES_SOURCE})
	${FIND} ${BUILD_WRKSRC}/examples ${_EXAMPLES_PROGRAM} -execdir \
		${INSTALL_PROGRAM} {} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}-{} \
		\;

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/sfml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539702187	1	TIMESTAMP = 1709964286
2	SHA256 (SFML-SFML-2.5.1_GH0.tar.gz) = 438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785	2	SHA256 (SFML-SFML-2.6.1_GH0.tar.gz) = 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d
3	SIZE (SFML-SFML-2.5.1_GH0.tar.gz) = 22868556	3	SIZE (SFML-SFML-2.6.1_GH0.tar.gz) = 25499153




--- CMakeLists.txt.orig	2024-03-09 06:19:34 UTC
+++ CMakeLists.txt
@@ -415,9 +415,6 @@ endif()
             COMPONENT devel)
 endif()
 
-install(FILES license.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install(FILES readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
 # install 3rd-party libraries and tools
 if(SFML_OS_WINDOWS)
 




--- examples/island/Island.cpp.orig	2024-03-10 03:27:38 UTC
+++ examples/island/Island.cpp
@@ -85,7 +85,7 @@ int main()
     window.setVerticalSyncEnabled(true);
 
     sf::Font font;
-    if (!font.loadFromFile("resources/tuffy.ttf"))
+    if (!font.loadFromFile("%%DATADIR%%/resources/tuffy.ttf"))
         return EXIT_FAILURE;
 
     // Create all of our graphics resources
@@ -120,7 +120,7 @@ int main()
     {
         statusText.setString("Shaders and/or Vertex Buffers Unsupported");
     }
-    else if (!terrainShader.loadFromFile("resources/terrain.vert", "resources/terrain.frag"))
+    else if (!terrainShader.loadFromFile("%%DATADIR%%/resources/terrain.vert", "%%DATADIR%%/resources/terrain.frag"))
     {
         prerequisitesSupported = false;
 

Added Link Here

(-)b/devel/sfml/files/patch-examples_joystick_Joystick.cpp (+11 lines)
1	--- examples/joystick/Joystick.cpp.orig 2024-03-10 03:28:00 UTC
2	+++ examples/joystick/Joystick.cpp
3	@@ -93,7 +93,7 @@ int main()
4
5	// Load the text font
6	sf::Font font;
7	- if (!font.loadFromFile("resources/tuffy.ttf"))
8	+ if (!font.loadFromFile("%%DATADIR%%/resources/tuffy.ttf"))
9	return EXIT_FAILURE;
10
11	// Set up our string conversion parameters

Added Link Here

(-)b/devel/sfml/files/patch-examples_opengl_OpenGL.cpp (+11 lines)
1	--- examples/opengl/OpenGL.cpp.orig 2024-03-10 03:42:28 UTC
2	+++ examples/opengl/OpenGL.cpp
3	@@ -20,7 +20,7 @@ std::string resourcesDir()
4	#ifdef SFML_SYSTEM_IOS
5	return "";
6	#else
7	- return "resources/";
8	+ return "%%DATADIR%%/resources/";
9	#endif
10	}
11




--- examples/shader/Shader.cpp.orig	2024-03-10 03:30:04 UTC
+++ examples/shader/Shader.cpp
@@ -24,12 +24,12 @@ class Pixelate : public Effect (public)
     bool onLoad()
     {
         // Load the texture and initialize the sprite
-        if (!m_texture.loadFromFile("resources/background.jpg"))
+        if (!m_texture.loadFromFile("%%DATADIR%%/resources/background.jpg"))
             return false;
         m_sprite.setTexture(m_texture);
 
         // Load the shader
-        if (!m_shader.loadFromFile("resources/pixelate.frag", sf::Shader::Fragment))
+        if (!m_shader.loadFromFile("%%DATADIR%%/resources/pixelate.frag", sf::Shader::Fragment))
             return false;
         m_shader.setUniform("texture", sf::Shader::CurrentTexture);
 
@@ -93,7 +93,7 @@ class WaveBlur : public Effect (public)
         m_text.setPosition(30, 20);
 
         // Load the shader
-        if (!m_shader.loadFromFile("resources/wave.vert", "resources/blur.frag"))
+        if (!m_shader.loadFromFile("%%DATADIR%%/resources/wave.vert", "%%DATADIR%%/resources/blur.frag"))
             return false;
 
         return true;
@@ -146,7 +146,7 @@ class StormBlink : public Effect (public)
         }
 
         // Load the shader
-        if (!m_shader.loadFromFile("resources/storm.vert", "resources/blink.frag"))
+        if (!m_shader.loadFromFile("%%DATADIR%%/resources/storm.vert", "%%DATADIR%%/resources/blink.frag"))
             return false;
 
         return true;
@@ -194,10 +194,10 @@ class Edge : public Effect (public)
         m_surface.setSmooth(true);
 
         // Load the textures
-        if (!m_backgroundTexture.loadFromFile("resources/sfml.png"))
+        if (!m_backgroundTexture.loadFromFile("%%DATADIR%%/resources/sfml.png"))
             return false;
         m_backgroundTexture.setSmooth(true);
-        if (!m_entityTexture.loadFromFile("resources/devices.png"))
+        if (!m_entityTexture.loadFromFile("%%DATADIR%%/resources/devices.png"))
             return false;
         m_entityTexture.setSmooth(true);
 
@@ -213,7 +213,7 @@ class Edge : public Effect (public)
         }
 
         // Load the shader
-        if (!m_shader.loadFromFile("resources/edge.frag", sf::Shader::Fragment))
+        if (!m_shader.loadFromFile("%%DATADIR%%/resources/edge.frag", sf::Shader::Fragment))
             return false;
         m_shader.setUniform("texture", sf::Shader::CurrentTexture);
 
@@ -287,11 +287,11 @@ class Geometry : public Effect (public)
         }
 
         // Load the texture
-        if (!m_logoTexture.loadFromFile("resources/logo.png"))
+        if (!m_logoTexture.loadFromFile("%%DATADIR%%/resources/logo.png"))
             return false;
 
         // Load the shader
-        if (!m_shader.loadFromFile("resources/billboard.vert", "resources/billboard.geom", "resources/billboard.frag"))
+        if (!m_shader.loadFromFile("%%DATADIR%%/resources/billboard.vert", "%%DATADIR%%/resources/billboard.geom", "%%DATADIR%%/resources/billboard.frag"))
             return false;
         m_shader.setUniform("texture", sf::Shader::CurrentTexture);
 
@@ -352,7 +352,7 @@ int main()
 
     // Load the application font and pass it to the Effect class
     sf::Font font;
-    if (!font.loadFromFile("resources/tuffy.ttf"))
+    if (!font.loadFromFile("%%DATADIR%%/resources/tuffy.ttf"))
         return EXIT_FAILURE;
     Effect::setFont(font);
 
@@ -371,7 +371,7 @@ int main()
 
     // Create the messages background
     sf::Texture textBackgroundTexture;
-    if (!textBackgroundTexture.loadFromFile("resources/text-background.png"))
+    if (!textBackgroundTexture.loadFromFile("%%DATADIR%%/resources/text-background.png"))
         return EXIT_FAILURE;
     sf::Sprite textBackground(textBackgroundTexture);
     textBackground.setPosition(0, 520);




--- examples/sound/Sound.cpp.orig	2024-03-10 03:30:22 UTC
+++ examples/sound/Sound.cpp
@@ -15,7 +15,7 @@ void playSound()
 {
     // Load a sound buffer from a wav file
     sf::SoundBuffer buffer;
-    if (!buffer.loadFromFile("resources/killdeer.wav"))
+    if (!buffer.loadFromFile("%%DATADIR%%/resources/killdeer.wav"))
         return;
 
     // Display sound informations
@@ -50,7 +50,7 @@ void playMusic(const std::string& filename)
 {
     // Load an ogg music file
     sf::Music music;
-    if (!music.openFromFile("resources/" + filename))
+    if (!music.openFromFile("%%DATADIR%%/resources/" + filename))
         return;
 
     // Display music informations

Added Link Here

(-)b/devel/sfml/files/patch-examples_tennis_Tennis.cpp (+11 lines)
1	--- examples/tennis/Tennis.cpp.orig 2024-03-10 03:44:29 UTC
2	+++ examples/tennis/Tennis.cpp
3	@@ -17,7 +17,7 @@ std::string resourcesDir()
4	#ifdef SFML_SYSTEM_IOS
5	return "";
6	#else
7	- return "resources/";
8	+ return "%%DATADIR%%/resources/";
9	#endif
10	}
11




--- examples/vulkan/Vulkan.cpp.orig	2024-03-10 03:31:07 UTC
+++ examples/vulkan/Vulkan.cpp
@@ -888,7 +888,7 @@ class VulkanExample (public)
         {
             sf::FileInputStream file;
 
-            if (!file.open("resources/shader.vert.spv"))
+            if (!file.open("%%DATADIR%%/resources/shader.vert.spv"))
             {
                 vulkanAvailable = false;
                 return;
@@ -916,7 +916,7 @@ class VulkanExample (public)
         {
             sf::FileInputStream file;
 
-            if (!file.open("resources/shader.frag.spv"))
+            if (!file.open("%%DATADIR%%/resources/shader.frag.spv"))
             {
                 vulkanAvailable = false;
                 return;
@@ -1751,7 +1751,7 @@ class VulkanExample (public)
         // Load the image data
         sf::Image imageData;
 
-        if (!imageData.loadFromFile("resources/logo.png"))
+        if (!imageData.loadFromFile("%%DATADIR%%/resources/logo.png"))
         {
             vulkanAvailable = false;
             return;




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
     {




%%EXAMPLES%%bin/sfml-X11Example
%%EXAMPLES%%bin/sfml-ftp
%%EXAMPLES%%bin/sfml-island
%%EXAMPLES%%bin/sfml-joystick
%%EXAMPLES%%bin/sfml-opengl
%%EXAMPLES%%bin/sfml-shader
%%EXAMPLES%%bin/sfml-sockets
%%EXAMPLES%%bin/sfml-sound
%%EXAMPLES%%bin/sfml-sound-capture
%%EXAMPLES%%bin/sfml-tennis
%%EXAMPLES%%bin/sfml-voip
%%EXAMPLES%%bin/sfml-vulkan
%%EXAMPLES%%bin/sfml-window
include/SFML/Audio.hpp
include/SFML/Audio/AlResource.hpp
include/SFML/Audio/Export.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

lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/SFML/SFMLSharedTargets.cmake
%%AUDIO%%lib/libsfml-audio.so
%%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.6
%%GRAPHICS%%lib/libsfml-graphics.so.2.6.1
%%NETWORK%%lib/libsfml-network.so
%%NETWORK%%lib/libsfml-network.so.2.6
%%NETWORK%%lib/libsfml-network.so.2.6.1
lib/libsfml-system.so
lib/libsfml-system.so.2.6
lib/libsfml-system.so.2.6.1
%%WINDOW%%lib/libsfml-window.so
%%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
- 

Return to bug 277491

Lines 1-70 Link Here

(-)b/devel/sfml/Makefile (-38 / +59 lines)
1	PORTNAME= sfml	1	PORTNAME= SFML
2	PORTVERSION= 2.5.1	2	PORTVERSION= 2.6.1
3	PORTREVISION= 4
4	CATEGORIES= devel	3	CATEGORIES= devel
5		4
6	MAINTAINER= amdmi3@FreeBSD.org	5	MAINTAINER= amdmi3@FreeBSD.org
7	COMMENT= Simple and Fast Multimedia Library	6	COMMENT= Simple and Fast Multimedia Library
8	WWW= https://www.sfml-dev.org/	7	WWW= https://www.sfml-dev.org/
9		8
10	LICENSE= ZLIB	9	LICENSE= CC0-1.0 ZLIB
		10	LICENSE_COMB= multi
11	LICENSE_FILE= ${WRKSRC}/license.md	11	LICENSE_FILE= ${WRKSRC}/license.md
12		12
13	USE_GITHUB= yes
14	GH_ACCOUNT= SFML
15	GH_PROJECT= SFML
16
17	USES= cmake compiler:c++11-lang	13	USES= cmake compiler:c++11-lang
18	USE_CXXSTD= c++14	14	USE_CXXSTD= c++14
19	CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON \	15	USE_GITHUB= yes
20	-DSFML_USE_SYSTEM_DEPS=ON
21	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
22		17
23	DATADIR= ${PREFIX}/share/SFML	18	CMAKE_ARGS= -DSFML_USE_SYSTEM_DEPS=ON
		19
		20	EXTRACT_AFTER_ARGS= ${_DIST_EXCLUDES:S,^,--exclude ,}
		21
24	PORTDATA= *	22	PORTDATA= *
25	PORTDOCS= *	23	PORTDOCS= *
26	PORTEXAMPLES= *	24	PORTEXAMPLES= *
27		25
28	OPTIONS_DEFINE= DOCS EXAMPLES DOXYGEN	26	OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES
29	OPTIONS_GROUP= MODULES	27	OPTIONS_DEFAULT= ${OPTIONS_GROUP_MODULES}
30	OPTIONS_GROUP_MODULES= WINDOW GRAPHICS AUDIO NETWORK	28	OPTIONS_GROUP= MODULES
31	OPTIONS_DEFAULT=${OPTIONS_GROUP_MODULES}	29	OPTIONS_GROUP_MODULES= AUDIO GRAPHICS NETWORK WINDOW
32	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
33		31
		32	AUDIO_DESC= SFML Audio module
		33	GRAPHICS_DESC= SFML Graphics module
34	MODULES_DESC= SFML modules	34	MODULES_DESC= SFML modules
		35	NETWORK_DESC= SFML Network module
		36	WINDOW_DESC= SFML Window module
35		37
36	WINDOW_DESC= SFML Window module
37	WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW
38	WINDOW_USES= gl xorg
39	WINDOW_USE= XORG=x11,xrandr GL=gl
40
41	GRAPHICS_DESC= SFML Graphics module
42	GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS
43	GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2
44	GRAPHICS_IMPLIES= WINDOW
45
46	AUDIO_DESC= SFML Audio module
47	AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO
48	AUDIO_USES= openal:al
49	AUDIO_LIB_DEPENDS= libFLAC.so:audio/flac \	38	AUDIO_LIB_DEPENDS= libFLAC.so:audio/flac \
50	libogg.so:audio/libogg \	39	libogg.so:audio/libogg \
51	libvorbis.so:audio/libvorbis	40	libvorbis.so:audio/libvorbis
52		41	AUDIO_USES= openal:al
53	NETWORK_DESC= SFML Network module	42	AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO
54	NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK
55
56	DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC
57	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
58	DOXYGEN_IMPLIES= DOCS	43	DOXYGEN_IMPLIES= DOCS
59		44	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
		45	DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC
60	EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES	46	EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES
		47	GRAPHICS_IMPLIES= WINDOW
		48	GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2
		49	GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS
		50	NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK
		51	WINDOW_USES= gl xorg
		52	WINDOW_USE= GL=gl \
		53	XORG=x11,xcursor,xrandr
		54	WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW
61		55
62	post-install:	56	_DIST_EXCLUDES= examples/android examples/assets examples/cocoa \
63	@${RM} ${STAGEDIR}${PREFIX}/*.pc	57	examples/win32
		58	_EXAMPLES_ASSETS= -type f -not -name '.bak' -not -name '.cpp' -not \
		59	-name '.h' -not -name '.hpp' -not -name '*.orig' -not \
		60	-name CMakeLists.txt
		61	_EXAMPLES_PROGRAM= -depth 2 -type f -and -not -type d -and -not -name \
		62	CMakeFiles -perm -o=+x
		63	_EXAMPLES_SOURCE= "-not -name .bak -not -name .orig -not -name asset_licenses.md -not -name CMakeLists.txt -not -regex .resources."
		64
		65	post-patch:
		66	${REINPLACE_CMD} -e 's\|%%DATADIR%%\|${DATADIR}\|g' \
		67	${WRKSRC}/examples/island/Island.cpp \
		68	${WRKSRC}/examples/joystick/Joystick.cpp \
		69	${WRKSRC}/examples/opengl/OpenGL.cpp \
		70	${WRKSRC}/examples/shader/Shader.cpp \
		71	${WRKSRC}/examples/sound/Sound.cpp \
		72	${WRKSRC}/examples/tennis/Tennis.cpp \
		73	${WRKSRC}/examples/vulkan/Vulkan.cpp
64		74
65	post-install-DOCS-on:	75	post-install-DOCS-on:
66	@${MKDIR} ${STAGEDIR}${DOCSDIR}	76	@${MKDIR} ${STAGEDIR}${DOCSDIR}
67	${INSTALL_DATA} ${WRKSRC}/changelog.md ${WRKSRC}/readme.md \	77	${INSTALL_DATA} ${WRKSRC}/changelog.md ${WRKSRC}/readme.md \
68	${STAGEDIR}${DOCSDIR}	78	${STAGEDIR}${DOCSDIR}
69		79
		80	post-install-EXAMPLES-on:
		81	${MKDIR} ${STAGEDIR}${DATADIR}/resources
		82	${FIND} ${WRKSRC}/examples ${_EXAMPLES_ASSETS} -execdir ${INSTALL_DATA} \
		83	{} ${STAGEDIR}${DATADIR}/resources/{} \;
		84	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		85	(cd ${WRKSRC}/examples && \
		86	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${_EXAMPLES_SOURCE})
		87	${FIND} ${BUILD_WRKSRC}/examples ${_EXAMPLES_PROGRAM} -execdir \
		88	${INSTALL_PROGRAM} {} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}-{} \
		89	\;
		90
70	.include <bsd.port.mk>	91	.include <bsd.port.mk>

Added Link Here

(-)b/devel/sfml/files/patch-CMakeLists.txt (+12 lines)
1	--- CMakeLists.txt.orig 2024-03-09 06:19:34 UTC
2	+++ CMakeLists.txt
3	@@ -415,9 +415,6 @@ endif()
4	COMPONENT devel)
5	endif()
6
7	-install(FILES license.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
8	-install(FILES readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
9	-
10	# install 3rd-party libraries and tools
11	if(SFML_OS_WINDOWS)
12

Added Link Here

(-)b/devel/sfml/files/patch-examples_island_Island.cpp (+20 lines)
1	--- examples/island/Island.cpp.orig 2024-03-10 03:27:38 UTC
2	+++ examples/island/Island.cpp
3	@@ -85,7 +85,7 @@ int main()
4	window.setVerticalSyncEnabled(true);
5
6	sf::Font font;
7	- if (!font.loadFromFile("resources/tuffy.ttf"))
8	+ if (!font.loadFromFile("%%DATADIR%%/resources/tuffy.ttf"))
9	return EXIT_FAILURE;
10
11	// Create all of our graphics resources
12	@@ -120,7 +120,7 @@ int main()
13	{
14	statusText.setString("Shaders and/or Vertex Buffers Unsupported");
15	}
16	- else if (!terrainShader.loadFromFile("resources/terrain.vert", "resources/terrain.frag"))
17	+ else if (!terrainShader.loadFromFile("%%DATADIR%%/resources/terrain.vert", "%%DATADIR%%/resources/terrain.frag"))
18	{
19	prerequisitesSupported = false;
20

Added Link Here

(-)b/devel/sfml/files/patch-examples_shader_Shader.cpp (+89 lines)
1	--- examples/shader/Shader.cpp.orig 2024-03-10 03:30:04 UTC
2	+++ examples/shader/Shader.cpp
3	@@ -24,12 +24,12 @@ class Pixelate : public Effect (public)
4	bool onLoad()
5	{
6	// Load the texture and initialize the sprite
7	- if (!m_texture.loadFromFile("resources/background.jpg"))
8	+ if (!m_texture.loadFromFile("%%DATADIR%%/resources/background.jpg"))
9	return false;
10	m_sprite.setTexture(m_texture);
11
12	// Load the shader
13	- if (!m_shader.loadFromFile("resources/pixelate.frag", sf::Shader::Fragment))
14	+ if (!m_shader.loadFromFile("%%DATADIR%%/resources/pixelate.frag", sf::Shader::Fragment))
15	return false;
16	m_shader.setUniform("texture", sf::Shader::CurrentTexture);
17
18	@@ -93,7 +93,7 @@ class WaveBlur : public Effect (public)
19	m_text.setPosition(30, 20);
20
21	// Load the shader
22	- if (!m_shader.loadFromFile("resources/wave.vert", "resources/blur.frag"))
23	+ if (!m_shader.loadFromFile("%%DATADIR%%/resources/wave.vert", "%%DATADIR%%/resources/blur.frag"))
24	return false;
25
26	return true;
27	@@ -146,7 +146,7 @@ class StormBlink : public Effect (public)
28	}
29
30	// Load the shader
31	- if (!m_shader.loadFromFile("resources/storm.vert", "resources/blink.frag"))
32	+ if (!m_shader.loadFromFile("%%DATADIR%%/resources/storm.vert", "%%DATADIR%%/resources/blink.frag"))
33	return false;
34
35	return true;
36	@@ -194,10 +194,10 @@ class Edge : public Effect (public)
37	m_surface.setSmooth(true);
38
39	// Load the textures
40	- if (!m_backgroundTexture.loadFromFile("resources/sfml.png"))
41	+ if (!m_backgroundTexture.loadFromFile("%%DATADIR%%/resources/sfml.png"))
42	return false;
43	m_backgroundTexture.setSmooth(true);
44	- if (!m_entityTexture.loadFromFile("resources/devices.png"))
45	+ if (!m_entityTexture.loadFromFile("%%DATADIR%%/resources/devices.png"))
46	return false;
47	m_entityTexture.setSmooth(true);
48
49	@@ -213,7 +213,7 @@ class Edge : public Effect (public)
50	}
51
52	// Load the shader
53	- if (!m_shader.loadFromFile("resources/edge.frag", sf::Shader::Fragment))
54	+ if (!m_shader.loadFromFile("%%DATADIR%%/resources/edge.frag", sf::Shader::Fragment))
55	return false;
56	m_shader.setUniform("texture", sf::Shader::CurrentTexture);
57
58	@@ -287,11 +287,11 @@ class Geometry : public Effect (public)
59	}
60
61	// Load the texture
62	- if (!m_logoTexture.loadFromFile("resources/logo.png"))
63	+ if (!m_logoTexture.loadFromFile("%%DATADIR%%/resources/logo.png"))
64	return false;
65
66	// Load the shader
67	- if (!m_shader.loadFromFile("resources/billboard.vert", "resources/billboard.geom", "resources/billboard.frag"))
68	+ if (!m_shader.loadFromFile("%%DATADIR%%/resources/billboard.vert", "%%DATADIR%%/resources/billboard.geom", "%%DATADIR%%/resources/billboard.frag"))
69	return false;
70	m_shader.setUniform("texture", sf::Shader::CurrentTexture);
71
72	@@ -352,7 +352,7 @@ int main()
73
74	// Load the application font and pass it to the Effect class
75	sf::Font font;
76	- if (!font.loadFromFile("resources/tuffy.ttf"))
77	+ if (!font.loadFromFile("%%DATADIR%%/resources/tuffy.ttf"))
78	return EXIT_FAILURE;
79	Effect::setFont(font);
80
81	@@ -371,7 +371,7 @@ int main()
82
83	// Create the messages background
84	sf::Texture textBackgroundTexture;
85	- if (!textBackgroundTexture.loadFromFile("resources/text-background.png"))
86	+ if (!textBackgroundTexture.loadFromFile("%%DATADIR%%/resources/text-background.png"))
87	return EXIT_FAILURE;
88	sf::Sprite textBackground(textBackgroundTexture);
89	textBackground.setPosition(0, 520);

Added Link Here

(-)b/devel/sfml/files/patch-examples_sound_Sound.cpp (+20 lines)
1	--- examples/sound/Sound.cpp.orig 2024-03-10 03:30:22 UTC
2	+++ examples/sound/Sound.cpp
3	@@ -15,7 +15,7 @@ void playSound()
4	{
5	// Load a sound buffer from a wav file
6	sf::SoundBuffer buffer;
7	- if (!buffer.loadFromFile("resources/killdeer.wav"))
8	+ if (!buffer.loadFromFile("%%DATADIR%%/resources/killdeer.wav"))
9	return;
10
11	// Display sound informations
12	@@ -50,7 +50,7 @@ void playMusic(const std::string& filename)
13	{
14	// Load an ogg music file
15	sf::Music music;
16	- if (!music.openFromFile("resources/" + filename))
17	+ if (!music.openFromFile("%%DATADIR%%/resources/" + filename))
18	return;
19
20	// Display music informations

Added Link Here

(-)b/devel/sfml/files/patch-examples_vulkan_Vulkan.cpp (+29 lines)
1	--- examples/vulkan/Vulkan.cpp.orig 2024-03-10 03:31:07 UTC
2	+++ examples/vulkan/Vulkan.cpp
3	@@ -888,7 +888,7 @@ class VulkanExample (public)
4	{
5	sf::FileInputStream file;
6
7	- if (!file.open("resources/shader.vert.spv"))
8	+ if (!file.open("%%DATADIR%%/resources/shader.vert.spv"))
9	{
10	vulkanAvailable = false;
11	return;
12	@@ -916,7 +916,7 @@ class VulkanExample (public)
13	{
14	sf::FileInputStream file;
15
16	- if (!file.open("resources/shader.frag.spv"))
17	+ if (!file.open("%%DATADIR%%/resources/shader.frag.spv"))
18	{
19	vulkanAvailable = false;
20	return;
21	@@ -1751,7 +1751,7 @@ class VulkanExample (public)
22	// Load the image data
23	sf::Image imageData;
24
25	- if (!imageData.loadFromFile("resources/logo.png"))
26	+ if (!imageData.loadFromFile("%%DATADIR%%/resources/logo.png"))
27	{
28	vulkanAvailable = false;
29	return;

Removed Link Here

(-)a/devel/sfml/files/patch-src_SFML_Window_Unix_WindowImplX11.cpp (-15 lines)
1	src/SFML/Window/Unix/WindowImplX11.cpp:1278:36: error: reinterpret_cast from 'nullptr_t' to 'void *' is not allowed
2	reinterpret_cast<void*>(NULL));
3	^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4
5	--- src/SFML/Window/Unix/WindowImplX11.cpp.orig 2017-02-08 11:29:16 UTC
6	+++ src/SFML/Window/Unix/WindowImplX11.cpp
7	@@ -1275,7 +1275,7 @@ void WindowImplX11::initialize()
8	m_window,
9	XNInputStyle,
10	XIMPreeditNothing \| XIMStatusNothing,
11	- reinterpret_cast<void*>(NULL));
12	+ static_cast<void*>(NULL));
13	}
14	else
15	{

Lines 1-3 Link Here

(-)b/devel/sfml/pkg-plist (-11 / +25 lines)
		1	%%EXAMPLES%%bin/sfml-X11Example
		2	%%EXAMPLES%%bin/sfml-ftp
		3	%%EXAMPLES%%bin/sfml-island
		4	%%EXAMPLES%%bin/sfml-joystick
		5	%%EXAMPLES%%bin/sfml-opengl
		6	%%EXAMPLES%%bin/sfml-shader
		7	%%EXAMPLES%%bin/sfml-sockets
		8	%%EXAMPLES%%bin/sfml-sound
		9	%%EXAMPLES%%bin/sfml-sound-capture
		10	%%EXAMPLES%%bin/sfml-tennis
		11	%%EXAMPLES%%bin/sfml-voip
		12	%%EXAMPLES%%bin/sfml-vulkan
		13	%%EXAMPLES%%bin/sfml-window
1	include/SFML/Audio.hpp	14	include/SFML/Audio.hpp
2	include/SFML/Audio/AlResource.hpp	15	include/SFML/Audio/AlResource.hpp
3	include/SFML/Audio/Export.hpp	16	include/SFML/Audio/Export.hpp
Lines 102-108 include/SFML/Window/Mouse.hpp Link Here
102	include/SFML/Window/Sensor.hpp	115	include/SFML/Window/Sensor.hpp
103	include/SFML/Window/Touch.hpp	116	include/SFML/Window/Touch.hpp
104	include/SFML/Window/VideoMode.hpp	117	include/SFML/Window/VideoMode.hpp
		118	include/SFML/Window/Vulkan.hpp
105	include/SFML/Window/Window.hpp	119	include/SFML/Window/Window.hpp
		120	include/SFML/Window/WindowBase.hpp
106	include/SFML/Window/WindowHandle.hpp	121	include/SFML/Window/WindowHandle.hpp
107	include/SFML/Window/WindowStyle.hpp	122	include/SFML/Window/WindowStyle.hpp
108	lib/cmake/SFML/SFMLConfig.cmake	123	lib/cmake/SFML/SFMLConfig.cmake
Lines 111-130 lib/cmake/SFML/SFMLConfigVersion.cmake Link Here
111	lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake	126	lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
112	lib/cmake/SFML/SFMLSharedTargets.cmake	127	lib/cmake/SFML/SFMLSharedTargets.cmake
113	%%AUDIO%%lib/libsfml-audio.so	128	%%AUDIO%%lib/libsfml-audio.so
114	%%AUDIO%%lib/libsfml-audio.so.2.5	129	%%AUDIO%%lib/libsfml-audio.so.2.6
115	%%AUDIO%%lib/libsfml-audio.so.2.5.1	130	%%AUDIO%%lib/libsfml-audio.so.2.6.1
116	%%GRAPHICS%%lib/libsfml-graphics.so	131	%%GRAPHICS%%lib/libsfml-graphics.so
117	%%GRAPHICS%%lib/libsfml-graphics.so.2.5	132	%%GRAPHICS%%lib/libsfml-graphics.so.2.6
118	%%GRAPHICS%%lib/libsfml-graphics.so.2.5.1	133	%%GRAPHICS%%lib/libsfml-graphics.so.2.6.1
119	%%NETWORK%%lib/libsfml-network.so	134	%%NETWORK%%lib/libsfml-network.so
120	%%NETWORK%%lib/libsfml-network.so.2.5	135	%%NETWORK%%lib/libsfml-network.so.2.6
121	%%NETWORK%%lib/libsfml-network.so.2.5.1	136	%%NETWORK%%lib/libsfml-network.so.2.6.1
122	lib/libsfml-system.so	137	lib/libsfml-system.so
123	lib/libsfml-system.so.2.5	138	lib/libsfml-system.so.2.6
124	lib/libsfml-system.so.2.5.1	139	lib/libsfml-system.so.2.6.1
125	%%WINDOW%%lib/libsfml-window.so	140	%%WINDOW%%lib/libsfml-window.so
126	%%WINDOW%%lib/libsfml-window.so.2.5	141	%%WINDOW%%lib/libsfml-window.so.2.6
127	%%WINDOW%%lib/libsfml-window.so.2.5.1	142	%%WINDOW%%lib/libsfml-window.so.2.6.1
128	libdata/pkgconfig/sfml-all.pc	143	libdata/pkgconfig/sfml-all.pc
129	%%AUDIO%%libdata/pkgconfig/sfml-audio.pc	144	%%AUDIO%%libdata/pkgconfig/sfml-audio.pc
130	%%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc	145	%%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc
131	-