Index | Thread | Search

From:
Theo Buehler <tb@theobuehler.org>
Subject:
Re: UPDATE: multimedia/sfml
To:
Rafael Sadowski <rafael@sizeofvoid.org>
Cc:
Pascal Stumpf <pascal@stumpf.co>, ports@openbsd.org
Date:
Mon, 25 Aug 2025 07:09:22 +0200

Download raw body.

Thread
On Sun, Aug 24, 2025 at 09:14:13PM +0200, Rafael Sadowski wrote:
> Simple update multimedia/sfml to 3.0. This update fix the
> build with libc++19.
> 
> diff --git a/multimedia/sfml/Makefile b/multimedia/sfml/Makefile
> index 5305bde30bd..1680747d85d 100644
> --- a/multimedia/sfml/Makefile
> +++ b/multimedia/sfml/Makefile
> @@ -1,16 +1,15 @@
>  COMMENT =		simple and fast multimedia library
>  
> -V =			2.5.1
> +V =			3.0.0
>  DISTNAME =		SFML-${V}-sources
>  PKGNAME =		sfml-${V}
> -REVISION =		0
>  EXTRACT_SUFX =		.zip
>  
> -SHARED_LIBS +=  sfml-audio                2.0 # 2.1
> -SHARED_LIBS +=  sfml-graphics             2.0 # 2.1
> -SHARED_LIBS +=  sfml-network              2.0 # 2.1
> -SHARED_LIBS +=  sfml-system               2.0 # 2.1
> -SHARED_LIBS +=  sfml-window               2.0 # 2.1
> +SHARED_LIBS +=  sfml-audio                3.0 # 3.0
> +SHARED_LIBS +=  sfml-graphics             3.0 # 3.0
> +SHARED_LIBS +=  sfml-network              3.0 # 3.0
> +SHARED_LIBS +=  sfml-system               3.0 # 3.0
> +SHARED_LIBS +=  sfml-window               3.0 # 3.0

The shared libs become static with this diff, so the bump makes no sense.

>  
>  CATEGORIES =		multimedia
>  
> @@ -32,11 +31,12 @@ COMPILER =		base-clang ports-gcc
>  
>  CXXFLAGS_base-clang =	-std=c++14
>  
> -LIB_DEPENDS =		audio/openal \
> +LIB_DEPENDS =		audio/flac \
> +			audio/libogg \
>  			audio/libvorbis \
> -			audio/flac
> +			audio/openal
>  
> -CONFIGURE_ARGS +=	-DSFML_INSTALL_PKGCONFIG_FILES=BOOL:TRUE
> +CONFIGURE_ARGS +=	-DSFML_INSTALL_PKGCONFIG_FILES=ON
>  
>  FAKE_FLAGS =		DESTDIR=${DESTDIR} PREFIX=${PREFIX}
>  .for l v in ${SHARED_LIBS}
> diff --git a/multimedia/sfml/distinfo b/multimedia/sfml/distinfo
> index 7178f00d0bf..89b33b9b157 100644
> --- a/multimedia/sfml/distinfo
> +++ b/multimedia/sfml/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (SFML-2.5.1-sources.zip) = vx4GQ6y5I2myRXK3A0c69gusgsr1r2HnfAY7d5Rxu38=
> -SIZE (SFML-2.5.1-sources.zip) = 23283095
> +SHA256 (SFML-3.0.0-sources.zip) = jMQdtGtZ8HxE7PIcdKD5VtN3Nd7J2Q/0UihWyxYrpkI=
> +SIZE (SFML-3.0.0-sources.zip) = 4846682
> diff --git a/multimedia/sfml/patches/patch-cmake_Config_cmake b/multimedia/sfml/patches/patch-cmake_Config_cmake
> deleted file mode 100644
> index 5884553e9d2..00000000000
> --- a/multimedia/sfml/patches/patch-cmake_Config_cmake
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Index: cmake/Config.cmake
> ---- cmake/Config.cmake.orig
> -+++ cmake/Config.cmake
> -@@ -73,7 +73,7 @@ endif()
> - # this could be e.g. macports on mac or msys2 on windows etc.
> - set(SFML_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
> - 
> --if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
> -+if(SFML_OS_FREEBSD)
> -     set(SFML_PKGCONFIG_DIR "/libdata/pkgconfig")
> - endif()
> - 
> diff --git a/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in b/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in
> deleted file mode 100644
> index 9c4e4cb59db..00000000000
> --- a/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Index: cmake/SFMLConfigDependencies.cmake.in
> ---- cmake/SFMLConfigDependencies.cmake.in.orig
> -+++ cmake/SFMLConfigDependencies.cmake.in
> -@@ -12,6 +12,8 @@ if(SFML_STATIC_LIBRARIES)
> -         set(FIND_SFML_OS_LINUX 1)
> -     elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
> -         set(FIND_SFML_OS_FREEBSD 1)
> -+    elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
> -+        set(FIND_SFML_OS_OPENBSD 1)
> -     elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
> -         if (DEFINED IOS)
> -             set(FIND_SFML_OS_IOS 1)
> -@@ -44,7 +46,7 @@ if(SFML_STATIC_LIBRARIES)
> -     # sfml-window
> -     list(FIND SFML_FIND_COMPONENTS "window" FIND_SFML_WINDOW_COMPONENT_INDEX)
> -     if(FIND_SFML_WINDOW_COMPONENT_INDEX GREATER -1)
> --        if(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD)
> -+        if(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD OR FIND_SFML_OS_OPENBSD)
> -             sfml_bind_dependency(TARGET X11 FRIENDLY_NAME "X11" SEARCH_NAMES "X11")
> -             sfml_bind_dependency(TARGET X11 FRIENDLY_NAME "Xrandr" SEARCH_NAMES "Xrandr")
> -         endif()
> diff --git a/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp b/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp
> deleted file mode 100644
> index 48844af6d59..00000000000
> --- a/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Index: src/SFML/Window/Unix/WindowImplX11.cpp
> ---- src/SFML/Window/Unix/WindowImplX11.cpp.orig
> -+++ src/SFML/Window/Unix/WindowImplX11.cpp
> -@@ -1556,7 +1556,7 @@ void WindowImplX11::initialize()
> -                                    m_window,
> -                                    XNInputStyle,
> -                                    XIMPreeditNothing | XIMStatusNothing,
> --                                   reinterpret_cast<void*>(NULL));
> -+                                   static_cast<void*>(NULL));
> -     }
> -     else
> -     {
> diff --git a/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in b/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in
> index 1ec6de3eda1..ebb8cfeef8f 100644
> --- a/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in
> +++ b/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in
> @@ -3,7 +3,7 @@ Index: tools/pkg-config/sfml-window.pc.in
>  +++ tools/pkg-config/sfml-window.pc.in
>  @@ -8,7 +8,7 @@ Description: The Simple and Fast Multimedia Library, w
>   URL: http://www.sfml-dev.org
> - Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
> + Version: @PROJECT_VERSION@
>   Requires: sfml-system
>  -Libs: -L${libdir} -lsfml-window
>  +Libs: -L${libdir} -lsfml-window -L${X11BASE}/lib -lX11 -lXrandr
> diff --git a/multimedia/sfml/pkg/PLIST b/multimedia/sfml/pkg/PLIST
> index f7d16814a20..7042680fb14 100644
> --- a/multimedia/sfml/pkg/PLIST
> +++ b/multimedia/sfml/pkg/PLIST
> @@ -1,15 +1,17 @@
>  include/SFML/
>  include/SFML/Audio/
>  include/SFML/Audio.hpp
> -include/SFML/Audio/AlResource.hpp
> +include/SFML/Audio/AudioResource.hpp
>  include/SFML/Audio/Export.hpp
>  include/SFML/Audio/InputSoundFile.hpp
>  include/SFML/Audio/Listener.hpp
>  include/SFML/Audio/Music.hpp
>  include/SFML/Audio/OutputSoundFile.hpp
> +include/SFML/Audio/PlaybackDevice.hpp
>  include/SFML/Audio/Sound.hpp
>  include/SFML/Audio/SoundBuffer.hpp
>  include/SFML/Audio/SoundBufferRecorder.hpp
> +include/SFML/Audio/SoundChannel.hpp
>  include/SFML/Audio/SoundFileFactory.hpp
>  include/SFML/Audio/SoundFileFactory.inl
>  include/SFML/Audio/SoundFileReader.hpp
> @@ -24,7 +26,9 @@ include/SFML/Graphics.hpp
>  include/SFML/Graphics/BlendMode.hpp
>  include/SFML/Graphics/CircleShape.hpp
>  include/SFML/Graphics/Color.hpp
> +include/SFML/Graphics/Color.inl
>  include/SFML/Graphics/ConvexShape.hpp
> +include/SFML/Graphics/CoordinateType.hpp
>  include/SFML/Graphics/Drawable.hpp
>  include/SFML/Graphics/Export.hpp
>  include/SFML/Graphics/Font.hpp
> @@ -43,9 +47,11 @@ include/SFML/Graphics/RenderWindow.hpp
>  include/SFML/Graphics/Shader.hpp
>  include/SFML/Graphics/Shape.hpp
>  include/SFML/Graphics/Sprite.hpp
> +include/SFML/Graphics/StencilMode.hpp
>  include/SFML/Graphics/Text.hpp
>  include/SFML/Graphics/Texture.hpp
>  include/SFML/Graphics/Transform.hpp
> +include/SFML/Graphics/Transform.inl
>  include/SFML/Graphics/Transformable.hpp
>  include/SFML/Graphics/Vertex.hpp
>  include/SFML/Graphics/VertexArray.hpp
> @@ -68,25 +74,22 @@ include/SFML/Network/UdpSocket.hpp
>  include/SFML/OpenGL.hpp
>  include/SFML/System/
>  include/SFML/System.hpp
> +include/SFML/System/Angle.hpp
> +include/SFML/System/Angle.inl
>  include/SFML/System/Clock.hpp
>  include/SFML/System/Err.hpp
> +include/SFML/System/Exception.hpp
>  include/SFML/System/Export.hpp
>  include/SFML/System/FileInputStream.hpp
>  include/SFML/System/InputStream.hpp
> -include/SFML/System/Lock.hpp
>  include/SFML/System/MemoryInputStream.hpp
> -include/SFML/System/Mutex.hpp
>  include/SFML/System/NativeActivity.hpp
> -include/SFML/System/NonCopyable.hpp
>  include/SFML/System/Sleep.hpp
>  include/SFML/System/String.hpp
>  include/SFML/System/String.inl
> -include/SFML/System/Thread.hpp
> -include/SFML/System/Thread.inl
> -include/SFML/System/ThreadLocal.hpp
> -include/SFML/System/ThreadLocalPtr.hpp
> -include/SFML/System/ThreadLocalPtr.inl
> +include/SFML/System/SuspendAwareClock.hpp
>  include/SFML/System/Time.hpp
> +include/SFML/System/Time.inl
>  include/SFML/System/Utf.hpp
>  include/SFML/System/Utf.inl
>  include/SFML/System/Vector2.hpp
> @@ -100,6 +103,7 @@ include/SFML/Window/Context.hpp
>  include/SFML/Window/ContextSettings.hpp
>  include/SFML/Window/Cursor.hpp
>  include/SFML/Window/Event.hpp
> +include/SFML/Window/Event.inl
>  include/SFML/Window/Export.hpp
>  include/SFML/Window/GlResource.hpp
>  include/SFML/Window/Joystick.hpp
> @@ -108,26 +112,49 @@ 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/WindowBase.inl
> +include/SFML/Window/WindowEnums.hpp
>  include/SFML/Window/WindowHandle.hpp
> -include/SFML/Window/WindowStyle.hpp
>  lib/cmake/SFML/
> +lib/cmake/SFML/FindDRM.cmake
> +lib/cmake/SFML/FindEGL.cmake
> +lib/cmake/SFML/FindFLAC.cmake
> +lib/cmake/SFML/FindFreetype.cmake
> +lib/cmake/SFML/FindGBM.cmake
> +lib/cmake/SFML/FindGLES.cmake
> +lib/cmake/SFML/FindUDev.cmake
> +lib/cmake/SFML/FindVorbis.cmake
> +lib/cmake/SFML/SFMLAudioDependencies.cmake
> +lib/cmake/SFML/SFMLAudioStaticTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/SFML/SFMLAudioStaticTargets.cmake
>  lib/cmake/SFML/SFMLConfig.cmake
> -lib/cmake/SFML/SFMLConfigDependencies.cmake
>  lib/cmake/SFML/SFMLConfigVersion.cmake
> -lib/cmake/SFML/SFMLSharedTargets${MODCMAKE_BUILD_SUFFIX}
> -lib/cmake/SFML/SFMLSharedTargets.cmake
> -@lib lib/libsfml-audio.so.${LIBsfml-audio_VERSION}
> -@lib lib/libsfml-graphics.so.${LIBsfml-graphics_VERSION}
> -@lib lib/libsfml-network.so.${LIBsfml-network_VERSION}
> -@lib lib/libsfml-system.so.${LIBsfml-system_VERSION}
> -@lib lib/libsfml-window.so.${LIBsfml-window_VERSION}
> -lib/pkgconfig/sfml-all.pc
> -lib/pkgconfig/sfml-audio.pc
> -lib/pkgconfig/sfml-graphics.pc
> -lib/pkgconfig/sfml-network.pc
> -lib/pkgconfig/sfml-system.pc
> -lib/pkgconfig/sfml-window.pc
> -share/SFML/
> -share/SFML/license.md
> -share/SFML/readme.md
> +lib/cmake/SFML/SFMLGraphicsDependencies.cmake
> +lib/cmake/SFML/SFMLGraphicsStaticTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/SFML/SFMLGraphicsStaticTargets.cmake
> +lib/cmake/SFML/SFMLNetworkStaticTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/SFML/SFMLNetworkStaticTargets.cmake
> +lib/cmake/SFML/SFMLSystemDependencies.cmake
> +lib/cmake/SFML/SFMLSystemStaticTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/SFML/SFMLSystemStaticTargets.cmake
> +lib/cmake/SFML/SFMLWindowDependencies.cmake
> +lib/cmake/SFML/SFMLWindowStaticTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/SFML/SFMLWindowStaticTargets.cmake
> +@static-lib lib/libsfml-audio-s.a
> +@static-lib lib/libsfml-graphics-s.a
> +@static-lib lib/libsfml-network-s.a
> +@static-lib lib/libsfml-system-s.a
> +@static-lib lib/libsfml-window-s.a
> +libdata/pkgconfig/
> +libdata/pkgconfig/sfml-all.pc
> +libdata/pkgconfig/sfml-audio.pc
> +libdata/pkgconfig/sfml-graphics.pc
> +libdata/pkgconfig/sfml-network.pc
> +libdata/pkgconfig/sfml-system.pc
> +libdata/pkgconfig/sfml-window.pc
> +share/doc/SFML/
> +share/doc/SFML/license.md
> +share/doc/SFML/readme.md
>