diff --git a/devel/csfml/Makefile b/devel/csfml/Makefile index 7c616cd2eb23..dac6f459fc7e 100644 --- a/devel/csfml/Makefile +++ b/devel/csfml/Makefile @@ -1,24 +1,23 @@ PORTNAME= csfml DISTVERSION= 2.5.2 CATEGORIES= devel games graphics multimedia MAINTAINER= agh@riseup.net COMMENT= C bindings to the Simple and Fast Multimedia Library (SFML) 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 \ libsfml-system.so:devel/sfml \ libsfml-window.so:devel/sfml USES= cmake USE_GITHUB= yes GH_ACCOUNT= SFML GH_PROJECT= ${PORTNAME:tu} .include 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 @@ -1,133 +1,135 @@ include/SFML/Audio.hpp include/SFML/Audio/AlResource.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/Sound.hpp include/SFML/Audio/SoundBuffer.hpp include/SFML/Audio/SoundBufferRecorder.hpp include/SFML/Audio/SoundFileFactory.hpp include/SFML/Audio/SoundFileFactory.inl include/SFML/Audio/SoundFileReader.hpp include/SFML/Audio/SoundFileWriter.hpp include/SFML/Audio/SoundRecorder.hpp include/SFML/Audio/SoundSource.hpp include/SFML/Audio/SoundStream.hpp include/SFML/Config.hpp include/SFML/GpuPreference.hpp include/SFML/Graphics.hpp include/SFML/Graphics/BlendMode.hpp include/SFML/Graphics/CircleShape.hpp include/SFML/Graphics/Color.hpp include/SFML/Graphics/ConvexShape.hpp include/SFML/Graphics/Drawable.hpp include/SFML/Graphics/Export.hpp include/SFML/Graphics/Font.hpp include/SFML/Graphics/Glsl.hpp include/SFML/Graphics/Glsl.inl include/SFML/Graphics/Glyph.hpp include/SFML/Graphics/Image.hpp include/SFML/Graphics/PrimitiveType.hpp include/SFML/Graphics/Rect.hpp include/SFML/Graphics/Rect.inl include/SFML/Graphics/RectangleShape.hpp include/SFML/Graphics/RenderStates.hpp include/SFML/Graphics/RenderTarget.hpp include/SFML/Graphics/RenderTexture.hpp include/SFML/Graphics/RenderWindow.hpp include/SFML/Graphics/Shader.hpp include/SFML/Graphics/Shape.hpp include/SFML/Graphics/Sprite.hpp include/SFML/Graphics/Text.hpp include/SFML/Graphics/Texture.hpp include/SFML/Graphics/Transform.hpp include/SFML/Graphics/Transformable.hpp include/SFML/Graphics/Vertex.hpp include/SFML/Graphics/VertexArray.hpp include/SFML/Graphics/VertexBuffer.hpp include/SFML/Graphics/View.hpp include/SFML/Main.hpp include/SFML/Network.hpp include/SFML/Network/Export.hpp include/SFML/Network/Ftp.hpp include/SFML/Network/Http.hpp include/SFML/Network/IpAddress.hpp include/SFML/Network/Packet.hpp include/SFML/Network/Socket.hpp include/SFML/Network/SocketHandle.hpp include/SFML/Network/SocketSelector.hpp include/SFML/Network/TcpListener.hpp include/SFML/Network/TcpSocket.hpp include/SFML/Network/UdpSocket.hpp include/SFML/OpenGL.hpp include/SFML/System.hpp include/SFML/System/Clock.hpp include/SFML/System/Err.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/Time.hpp include/SFML/System/Utf.hpp include/SFML/System/Utf.inl include/SFML/System/Vector2.hpp include/SFML/System/Vector2.inl include/SFML/System/Vector3.hpp include/SFML/System/Vector3.inl include/SFML/Window.hpp include/SFML/Window/Clipboard.hpp include/SFML/Window/Context.hpp include/SFML/Window/ContextSettings.hpp include/SFML/Window/Cursor.hpp include/SFML/Window/Event.hpp include/SFML/Window/Export.hpp include/SFML/Window/GlResource.hpp include/SFML/Window/Joystick.hpp include/SFML/Window/Keyboard.hpp 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 lib/cmake/SFML/SFMLConfigDependencies.cmake 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 %%NETWORK%%libdata/pkgconfig/sfml-network.pc libdata/pkgconfig/sfml-system.pc %%WINDOW%%libdata/pkgconfig/sfml-window.pc diff --git a/games/emptyepsilon/Makefile b/games/emptyepsilon/Makefile index 931d21175280..8534e71925c9 100644 --- a/games/emptyepsilon/Makefile +++ b/games/emptyepsilon/Makefile @@ -1,41 +1,41 @@ PORTNAME= emptyepsilon DISTVERSIONPREFIX= EE- DISTVERSION= 2021.06.23 CATEGORIES= games MAINTAINER= yuri@FreeBSD.org COMMENT= Spaceship bridge simulator game WWW= https://daid.github.io/EmptyEpsilon/ LICENSE= GPLv2 AngryFly-Royalty-Free-License LICENSE_COMB= multi LICENSE_NAME_AngryFly-Royalty-Free-License= AngryFly Royalty-Free-License LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE 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 USE_GL= gl glu USE_GITHUB= yes GH_ACCOUNT= daid GH_PROJECT= EmptyEpsilon SeriousProton:sproton CMAKE_ARGS= -DSERIOUS_PROTON_DIR="${WRKSRC_sproton}/" post-patch: @${REINPLACE_CMD} -e 's|basepath + |"${DATADIR}/" + basepath + |' \ ${WRKSRC_sproton}/src/resources.cpp @${REINPLACE_CMD} -e 's|uint32_t bswap32(uint32_t value)|uint32_t bswap32_(uint32_t value)|' \ ${WRKSRC_sproton}/src/i18n.cpp # app uses xclip to read clipboard, ifdef and path need to be corrected @${REINPLACE_CMD} -e 's,defined(__APPLE__),& || defined(__FreeBSD__), ; s,"/usr/bin/xclip ,"${PREFIX}/bin/xclip ,' ${WRKSRC_sproton}/src/clipboard.cpp post-install: @${MV} ${STAGEDIR}${PREFIX}/bin/EmptyEpsilon ${STAGEDIR}${PREFIX}/bin/emptyepsilon .include