commit: 1ec69095bd850a96bd54cd59298f3d24a0554dfd Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Mon Feb 24 09:25:53 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Mon Feb 24 09:43:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec69095
media-libs/libsfml: drop 2.5.1-r2, 2.6.0 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> media-libs/libsfml/Manifest | 2 - .../files/libsfml-2.5.1-clang-16-auto_ptr.patch | 50 --------------- .../files/libsfml-2.5.1-musl-1.2.3-nullptr.patch | 14 ---- media-libs/libsfml/libsfml-2.5.1-r2.ebuild | 75 ---------------------- media-libs/libsfml/libsfml-2.6.0.ebuild | 74 --------------------- 5 files changed, 215 deletions(-) diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest index 43090803c3d8..dca278b61e11 100644 --- a/media-libs/libsfml/Manifest +++ b/media-libs/libsfml/Manifest @@ -1,4 +1,2 @@ -DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 -DIST libsfml-2.6.0.tar.gz 25493305 BLAKE2B 205db3aa9fa197dbc29c8b3a74c09651fb9ca8e60bf18e385b8ecfa350d85b31ab33b6d2e61b6cdcfdc3caf77a8af37cbe97445e871b6e688359b320a12a3cea SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a DIST libsfml-2.6.1.tar.gz 25499153 BLAKE2B 0e4251d7aade5a596e9d0afdaa86d843fb5ba3ca63fc4f9dccb2e7db70aa8ae253af30dba68d57dd6869a6142818575e6fd843005a6e54fe186b20b573ad8f63 SHA512 b376d3b00277ed60d107fe1268c210749b3aafcee618a8f924b181a9b476e92b9cb9baddecf70a8913b5910c471d53ea0260a876ad7b2db2b98b944d9f508714 DIST libsfml-2.6.2.tar.gz 28624288 BLAKE2B 52442ef05a2719c1e7cd45ba15a4a41af7f3026c7c3a01c55993769bde39c9426962d640ffa2ac293dd4d90b9290b5f0895fffe7c10d3ffadbc189b10001c7ff SHA512 d8a8bee3aa9acda4609104c2a9d4a2512e4be6d6e85fd4b24c287c03f60cfb888e669e61bfac4113dae35f0c3492559b65b3453baf38766d8c0223d9ab77aada diff --git a/media-libs/libsfml/files/libsfml-2.5.1-clang-16-auto_ptr.patch b/media-libs/libsfml/files/libsfml-2.5.1-clang-16-auto_ptr.patch deleted file mode 100644 index ba4f90e4c465..000000000000 --- a/media-libs/libsfml/files/libsfml-2.5.1-clang-16-auto_ptr.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49 -Bug: https://bugs.gentoo.org/910519 -From: Tobias Widlund <[email protected]> -Date: Fri, 18 Jan 2019 14:12:14 +0100 -Subject: [PATCH] Remove usages of std::auto_ptr to get rid of warnings when - building with gcc 8.2+ - ---- a/src/SFML/Audio/AudioDevice.cpp -+++ b/src/SFML/Audio/AudioDevice.cpp -@@ -29,7 +29,7 @@ - #include <SFML/Audio/ALCheck.hpp> - #include <SFML/Audio/Listener.hpp> - #include <SFML/System/Err.hpp> --#include <memory> -+#include <vector> - - - namespace -@@ -107,9 +107,13 @@ bool AudioDevice::isExtensionSupported(const std::string& extension) - // This device will not be used in this function and merely - // makes sure there is a valid OpenAL device for extension - // queries if none has been created yet. -- std::auto_ptr<AudioDevice> device; -+ // -+ // Using an std::vector for this since auto_ptr is deprecated -+ // and we have no better STL facility for dynamically allocating -+ // a temporary instance with strong exception guarantee. -+ std::vector<AudioDevice> device; - if (!audioDevice) -- device.reset(new AudioDevice); -+ device.resize(1); - - if ((extension.length() > 2) && (extension.substr(0, 3) == "ALC")) - return alcIsExtensionPresent(audioDevice, extension.c_str()) != AL_FALSE; -@@ -125,9 +129,13 @@ int AudioDevice::getFormatFromChannelCount(unsigned int channelCount) - // This device will not be used in this function and merely - // makes sure there is a valid OpenAL device for format - // queries if none has been created yet. -- std::auto_ptr<AudioDevice> device; -+ // -+ // Using an std::vector for this since auto_ptr is deprecated -+ // and we have no better STL facility for dynamically allocating -+ // a temporary instance with strong exception guarantee. -+ std::vector<AudioDevice> device; - if (!audioDevice) -- device.reset(new AudioDevice); -+ device.resize(1); - - // Find the good format according to the number of channels - int format = 0; diff --git a/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch deleted file mode 100644 index dc26ba285e17..000000000000 --- a/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/839639 -https://github.com/SFML/SFML/commit/c9f7cb3d525a995912fc62507802f3f265de2728.patch -https://git.alpinelinux.org/aports/plain/community/sfml/musl-1.2.3.patch ---- a/src/SFML/Window/Unix/WindowImplX11.cpp -+++ b/src/SFML/Window/Unix/WindowImplX11.cpp -@@ -1556,7 +1556,7 @@ - m_window, - XNInputStyle, - XIMPreeditNothing | XIMStatusNothing, -- reinterpret_cast<void*>(NULL)); -+ reinterpret_cast<void*>(0)); - } - else - { diff --git a/media-libs/libsfml/libsfml-2.5.1-r2.ebuild b/media-libs/libsfml/libsfml-2.5.1-r2.ebuild deleted file mode 100644 index e74ecee4c85c..000000000000 --- a/media-libs/libsfml/libsfml-2.5.1-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Simple and Fast Multimedia Library (SFML)" -HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"; -SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="debug doc examples" - -RDEPEND=" - media-libs/flac:= - media-libs/freetype:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libogg - media-libs/libvorbis - media-libs/openal - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libxcb - x11-libs/xcb-util-image - kernel_linux? ( virtual/libudev:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-text/doxygen ) -" - -DOCS=( changelog.md readme.md ) - -S="${WORKDIR}/SFML-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-musl-1.2.3-nullptr.patch - "${FILESDIR}"/${P}-clang-16-auto_ptr.patch -) - -src_prepare() { - sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ - doc/CMakeLists.txt || die - - find examples -name CMakeLists.txt -delete || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSFML_BUILD_DOC=$(usex doc) - -DSFML_INSTALL_PKGCONFIG_FILES=TRUE - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/cmake/Modules - doins cmake/SFMLConfig.cmake.in - doins cmake/SFMLConfigDependencies.cmake.in - - if use examples ; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - fi -} diff --git a/media-libs/libsfml/libsfml-2.6.0.ebuild b/media-libs/libsfml/libsfml-2.6.0.ebuild deleted file mode 100644 index 7427b45b2650..000000000000 --- a/media-libs/libsfml/libsfml-2.6.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Simple and Fast Multimedia Library (SFML)" -HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"; -SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="debug doc examples" - -RDEPEND=" - media-libs/flac:= - media-libs/freetype:2 - media-libs/libjpeg-turbo:= - media-libs/libogg - media-libs/libpng:= - media-libs/libvorbis - media-libs/openal - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libxcb - x11-libs/xcb-util-image - kernel_linux? ( virtual/libudev:= ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - doc? ( app-text/doxygen ) -" - -DOCS=( changelog.md readme.md ) - -PATCHES=( "${FILESDIR}"/libsfml-2.6.0-supress-werror.patch ) - -S="${WORKDIR}/SFML-${PV}" - -src_prepare() { - sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ - doc/CMakeLists.txt || die - - find examples -name CMakeLists.txt -delete || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSFML_BUILD_DOC=$(usex doc) - -DSFML_INSTALL_PKGCONFIG_FILES=TRUE - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/cmake/Modules - doins cmake/SFMLConfig.cmake.in - doins cmake/SFMLConfigDependencies.cmake.in - - if use examples ; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - fi -}
