gentoo auto-resync : 19:08:2023 - 15:38:48

3 files changed, 107 insertions, 0 deletions

diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 6dc964e11d67..c6f7965ed309 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,6 +1,9 @@
 AUX libsfml-2.5.1-clang-16-auto_ptr.patch 2070 BLAKE2B e443d1a19b89de878da4bc65f4b0fe70d9109f249b97efdbd6c12f14acb0bb10be39b986fab42b49cd2fe98bfd4fe230c7b6931ecaf4bf883f67ff873e00aa88 SHA512 30d8fe083c1243c7f418f291cd6fd7eeec95ae5670d75f8453059b1e93befb97b1290b1620a21768e975397abe9336169cf1ff8525f19517f4782d3e9b329085
 AUX libsfml-2.5.1-musl-1.2.3-nullptr.patch 626 BLAKE2B dac65018937df6088b5f44f57678b6acde4f67a4f03180428374f26c7248181058185bce053bb79fdd4d4044c6369740daed5db95f803965d2b15a3250bedd1c SHA512 76535c8d01f21cc32df1c66ba1567356737a9c14b73be1c03606305f905d31a615759054b60fbf3347a57d3b24ab9b3978c96f898262000fe4c58af697b7dac7
+AUX libsfml-2.6.0-supress-werror.patch 1618 BLAKE2B af0be020c1548bb793c332be85aed9c4ccffcab813bdce0ceeabe82605a5dfd5a1d0b3bd7d72dfa87e2b63d231c002d9ea547ee4545598f732dc555e187fc56b SHA512 7ac826330fe277ba479522e777dd980e357843795a78a3c21009693c8c9d5350a699e2134a1349c4d219496dd2bf99ff7e3c3d92b8cbd59808c2a1ff9ba18413
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
+DIST libsfml-2.6.0.tar.gz 25493305 BLAKE2B 205db3aa9fa197dbc29c8b3a74c09651fb9ca8e60bf18e385b8ecfa350d85b31ab33b6d2e61b6cdcfdc3caf77a8af37cbe97445e871b6e688359b320a12a3cea SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a
 EBUILD libsfml-2.5.1-r1.ebuild 1488 BLAKE2B 369b7e91f80616f2d9ebd54f780c4284b6ac76e9da487e40949cc15f0538192e73c803761aa3b6b96baab88678b1933df7bf77936dd9a973095207f040097058 SHA512 2d43769822c5275bfd56f5a657dfc81d2b9187b11fe07b71636d9ad2d5888a9c9f620b586dac166a5cfa0b24e25d6d4b50be7f8037cb827012958abf0356f11b
 EBUILD libsfml-2.5.1-r2.ebuild 1534 BLAKE2B 0759ff18d33cc7d2ab8410f4228e2c8cb45ea66497297d11bfe2c43be5e5cbc16fa88b19464ae41cc804ffd1e4765b1a34a7471982ba018ac482b889c958b49b SHA512 bb447e735cfe54eb72da8de2865b4a8be6c7f00aa3192dafae4eb5b18847d5c7bd1fb24997703679de561243ac13b7c8b315c7e5da691546d5b1b4558d4dfa8e
+EBUILD libsfml-2.6.0.ebuild 1536 BLAKE2B 8114920c48f2075ddead98cada808d58acddf1dfc4faf5899792d020960bc6f06a2d9c8920f9e1a532fe80992c66a19cc724f31b49ad077cb2aaf8d6d730638c SHA512 115105b2b825e57e3e7abd9662d105d40c43e5232db2889b619fa1613e90c279523425c084a8301c0f4f37769e425082f5a4aad54395f594ac0c3bfd381646ef
 MISC metadata.xml 733 BLAKE2B c5b2bf1cea8b01c89531f68544f8b82dc3f8b8e26327ec868cf2ce1beabd6b1b0e977ad4a5dd3cdcbe3ae0fd66930f0c411023d77f9c4a5f7464d90209fa6f6d SHA512 ffb4954d9d55f0ab147c8ef2d5e970ef728b0dd1ad78f04aac16346583a9b858d3861f6f3bfe0940ca4b41c23abf8904bf3e0160d347d9e007efa047e663ccda
diff --git a/media-libs/libsfml/files/libsfml-2.6.0-supress-werror.patch b/media-libs/libsfml/files/libsfml-2.6.0-supress-werror.patch
new file mode 100644
index 000000000000..1110b4b89492
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.6.0-supress-werror.patch
@@ -0,0 +1,30 @@
+This primarily to suppress error such as:
+/var/tmp/portage/media-libs/libsfml-2.6.0/work/SFML-2.6.0/src/SFML/Window/Unix/JoystickImpl.cpp:405:36: error: implicit conversion changes signedness: 'unsigned long' to 'int' [-Werror,-Wsign-conversion]
+            int result = ioctl(fd, JSIOCGNAME(sizeof(name)), name);
+                         ~~~~~     ^~~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/linux/joystick.h:59:26: note: expanded from macro 'JSIOCGNAME'
+#define JSIOCGNAME(len)         _IOC(_IOC_READ, 'j', 0x13, len)                 /* get identifier string */
+                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Even seems like upstream is has removed it with commit
+https://github.com/SFML/SFML/commit/aa82ea132b9296a31922772027ad5d14c1fa381b
+--- a/cmake/CompilerWarnings.cmake
++++ b/cmake/CompilerWarnings.cmake
+@@ -68,16 +68,11 @@ function(set_file_warnings)
+         # -Wimplicit-fallthrough # warn when a missing break causes control flow to continue at the next case in a switch statement (disabled until better compiler support for explicit fallthrough is available)
+         ${NON_ANDROID_CLANG_AND_GCC_WARNINGS}
+     )
+-    
++
+     # Disable warnings as errors when using Clang on Windows to work around deprecation warnings in Windows APIs
+     if(SFML_OS_WINDOWS AND (SFML_COMPILER_CLANG OR SFML_COMPILER_CLANG_CL))
+         set(WARNINGS_AS_ERRORS FALSE)
+     endif()
+-    
+-    if(WARNINGS_AS_ERRORS)
+-        set(CLANG_AND_GCC_WARNINGS ${CLANG_AND_GCC_WARNINGS} -Werror)
+-        set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
+-    endif()
+ 
+     set(CLANG_WARNINGS
+         ${CLANG_AND_GCC_WARNINGS}
diff --git a/media-libs/libsfml/libsfml-2.6.0.ebuild b/media-libs/libsfml/libsfml-2.6.0.ebuild
new file mode 100644
index 000000000000..eb139865f848
--- /dev/null
+++ b/media-libs/libsfml/libsfml-2.6.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 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-doc/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
+}