Date: Mon, 14 May 2018 13:48:30 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469887 - in head/devel/sfml: . files Message-ID: <201805141348.w4EDmUv3033688@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon May 14 13:48:29 2018 New Revision: 469887 URL: https://svnweb.freebsd.org/changeset/ports/469887 Log: - Update to 2.5.0 Added: head/devel/sfml/files/patch-cmake_Macros.cmake (contents, props changed) head/devel/sfml/files/patch-doc_CMakeLists.txt (contents, props changed) Modified: head/devel/sfml/Makefile head/devel/sfml/distinfo head/devel/sfml/pkg-plist Modified: head/devel/sfml/Makefile ============================================================================== --- head/devel/sfml/Makefile Mon May 14 13:14:59 2018 (r469886) +++ head/devel/sfml/Makefile Mon May 14 13:48:29 2018 (r469887) @@ -2,48 +2,68 @@ # $FreeBSD$ PORTNAME= sfml -PORTVERSION= 2.4.2 -PORTREVISION= 3 +PORTVERSION= 2.5.0 CATEGORIES= devel -MASTER_SITES= http://www.sfml-dev.org/download/sfml/${PORTVERSION}/ -DISTNAME= SFML-${PORTVERSION}-sources MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/license.txt +LICENSE_FILE= ${WRKSRC}/license.md -LIB_DEPENDS= libFLAC.so:audio/flac \ - libfreetype.so:print/freetype2 \ - libogg.so:audio/libogg \ - libvorbis.so:audio/libvorbis \ - libxcb-image.so:x11/xcb-util-image +USE_GITHUB= yes +GH_ACCOUNT= SFML +GH_PROJECT= SFML -USES= cmake compiler:c++11-lang dos2unix jpeg openal:al zip:infozip -CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON -DOS2UNIX_FILES= CMakeLists.txt -USE_XORG= x11 xext xrandr -USE_GL= gl +USES= cmake compiler:c++11-lang +CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON \ + -DSFML_USE_SYSTEM_DEPS=ON USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} - 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 +MODULES_DESC= SFML modules + +WINDOW_DESC= SFML Window module +WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW +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 +DOXYGEN_IMPLIES= DOCS EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES +post-install: + @${RM} ${STAGEDIR}${PREFIX}/*.pc + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/changelog.txt ${WRKSRC}/readme.txt \ + ${INSTALL_DATA} ${WRKSRC}/changelog.md ${WRKSRC}/readme.md \ ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/devel/sfml/distinfo ============================================================================== --- head/devel/sfml/distinfo Mon May 14 13:14:59 2018 (r469886) +++ head/devel/sfml/distinfo Mon May 14 13:48:29 2018 (r469887) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486984094 -SHA256 (SFML-2.4.2-sources.zip) = 8ba04f6fde6a7b42527d69742c49da2ac529354f71f553409f9f821d618de4b6 -SIZE (SFML-2.4.2-sources.zip) = 24961872 +TIMESTAMP = 1526052490 +SHA256 (SFML-SFML-2.5.0_GH0.tar.gz) = 4bc5ed0b6658f73a31bfb8b36878d71fe1678e6e95e4f20834ab589a1bdc7ef4 +SIZE (SFML-SFML-2.5.0_GH0.tar.gz) = 22864874 Added: head/devel/sfml/files/patch-cmake_Macros.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sfml/files/patch-cmake_Macros.cmake Mon May 14 13:48:29 2018 (r469887) @@ -0,0 +1,27 @@ +--- cmake/Macros.cmake.orig 2018-05-06 06:53:30 UTC ++++ cmake/Macros.cmake +@@ -227,12 +227,12 @@ macro(sfml_add_example target) + + # add the install rule + install(TARGETS ${target} +- RUNTIME DESTINATION ${SFML_MISC_INSTALL_PREFIX}/examples/${target} COMPONENT examples +- BUNDLE DESTINATION ${SFML_MISC_INSTALL_PREFIX}/examples/${target} COMPONENT examples) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/sfml/${target} COMPONENT examples ++ BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/sfml/${target} COMPONENT examples) + + # install the example's source code + install(FILES ${THIS_SOURCES} +- DESTINATION ${SFML_MISC_INSTALL_PREFIX}/examples/${target} ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/sfml/${target} + COMPONENT examples) + + if (THIS_RESOURCES_DIR) +@@ -243,7 +243,7 @@ macro(sfml_add_example target) + message(FATAL_ERROR "Given resources directory to install does not exist: ${THIS_RESOURCES_DIR}") + endif() + install(DIRECTORY ${THIS_RESOURCES_DIR} +- DESTINATION ${SFML_MISC_INSTALL_PREFIX}/examples/${target} ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/sfml/${target} + COMPONENT examples) + endif() + Added: head/devel/sfml/files/patch-doc_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sfml/files/patch-doc_CMakeLists.txt Mon May 14 13:48:29 2018 (r469887) @@ -0,0 +1,11 @@ +--- doc/CMakeLists.txt.orig 2018-05-06 06:53:30 UTC ++++ doc/CMakeLists.txt +@@ -53,7 +53,7 @@ add_custom_target(doc ALL + + # setup install rules + install(DIRECTORY ${DOXYGEN_OUTPUT_DIR}/html +- DESTINATION ${SFML_MISC_INSTALL_PREFIX}/doc ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/sfml + COMPONENT doc) + if(DOXYGEN_HHC_PROGRAM) + install(FILES ${DOXYGEN_OUTPUT_DIR}/sfml.chm Modified: head/devel/sfml/pkg-plist ============================================================================== --- head/devel/sfml/pkg-plist Mon May 14 13:14:59 2018 (r469886) +++ head/devel/sfml/pkg-plist Mon May 14 13:48:29 2018 (r469887) @@ -16,6 +16,7 @@ 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 @@ -45,6 +46,7 @@ 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 @@ -87,8 +89,10 @@ 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 @@ -101,24 +105,29 @@ include/SFML/Window/VideoMode.hpp include/SFML/Window/Window.hpp include/SFML/Window/WindowHandle.hpp include/SFML/Window/WindowStyle.hpp -lib/libsfml-audio.so -lib/libsfml-audio.so.2.4 -lib/libsfml-audio.so.2.4.2 -lib/libsfml-graphics.so -lib/libsfml-graphics.so.2.4 -lib/libsfml-graphics.so.2.4.2 -lib/libsfml-network.so -lib/libsfml-network.so.2.4 -lib/libsfml-network.so.2.4.2 +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.0 +%%GRAPHICS%%lib/libsfml-graphics.so +%%GRAPHICS%%lib/libsfml-graphics.so.2.5 +%%GRAPHICS%%lib/libsfml-graphics.so.2.5.0 +%%NETWORK%%lib/libsfml-network.so +%%NETWORK%%lib/libsfml-network.so.2.5 +%%NETWORK%%lib/libsfml-network.so.2.5.0 lib/libsfml-system.so -lib/libsfml-system.so.2.4 -lib/libsfml-system.so.2.4.2 -lib/libsfml-window.so -lib/libsfml-window.so.2.4 -lib/libsfml-window.so.2.4.2 +lib/libsfml-system.so.2.5 +lib/libsfml-system.so.2.5.0 +%%WINDOW%%lib/libsfml-window.so +%%WINDOW%%lib/libsfml-window.so.2.5 +%%WINDOW%%lib/libsfml-window.so.2.5.0 libdata/pkgconfig/sfml-all.pc -libdata/pkgconfig/sfml-audio.pc -libdata/pkgconfig/sfml-graphics.pc -libdata/pkgconfig/sfml-network.pc +%%AUDIO%%libdata/pkgconfig/sfml-audio.pc +%%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc +%%NETWORK%%libdata/pkgconfig/sfml-network.pc libdata/pkgconfig/sfml-system.pc -libdata/pkgconfig/sfml-window.pc +%%WINDOW%%libdata/pkgconfig/sfml-window.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805141348.w4EDmUv3033688>