gentoo auto-resync : 04:09:2023 - 10:20:54

3 files changed, 132 insertions, 0 deletions

diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 1a666e0b05b7..8b6a998e4bc8 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -2,6 +2,7 @@ AUX 65resid 63 BLAKE2B a50f13bb14d227e543b43b0a5969102431ae5903bb3c90106ec8b944d
 AUX libsidplay-1.36.59-fix-c++14.patch 786 BLAKE2B 4267e1c1ef3b982a4ff69c9e68b9a85a94c54866a9a2857bc290f6dc0ce4b268250439cab3ebfb093b8698456e660a003d53f94e1438ba1d8c80d64dc6295e36 SHA512 8fe86933a6009d2035e1a987c3da9050535a956833271cb59892c8093d5a66be6e2b3bf9d940a2f3e8c54fe54d2f70106a1796235f11ff11fff099ca040cd140
 AUX libsidplay-1.36.59-gcc43.patch 1338 BLAKE2B 8132fb754fd6fa3c9b5d34898f3a27c7db3ee221f91d89fa0b21cfc70a1bf689be6aa1f4bf6bc5409c98c7452077e706ae9358f0ade5faeb8aa90d67ff3c2671 SHA512 a3b795aef3bdfe3d435117b0d52a2f2bdd87f60b3ff1b21e0a3c08214396db897b75d8f97b8587a3cd4cb366598c01292f023003d3e055f542c903e91cb69cf6
 AUX libsidplay-2.1.1-autoconf.patch 5339 BLAKE2B 2658f312eadee4862279ed90635963c886c23402655f02a19f415379372b5f3d1f7204afaa5f4466f1fa1c03daaf490978dcda97a584a0eec0ed13bdc2991198 SHA512 fe67569cd0f4d7202f6dc4121c15365fbb6c97c57c4620f7bbc55c92dc28c72433f29e61241ca10e08a47db703718a03dfed3829b712bdcfd7dfc1fdf09f8954
+AUX libsidplay-2.1.1-clang16.patch 1757 BLAKE2B e2ff70edc7c3e673b7f05ecae1192110586e6ce1309199c770463f37f341bc0608ddad18280b57ac069bb0f95d5f6e36389d422fbe7705e9a66e74d82055ef59 SHA512 ede7aadd9cf09935b07606b1f6717bf0e6bafb7b811bbd4042105e947b10b562d1420b46b2b81a8164990326c95c5e37b6a7876e94481f65192641c96c5ffe42
 AUX libsidplay-2.1.1-fbsd.patch 333 BLAKE2B b55f14ba3aa8e73fd107a768991bc81aca78ce871f9933fef47cafa138fd11aabc286cad5b8a53ac829e371ffdda43be0514d244b4094b5f25469a13d2984559 SHA512 bb2f7f16a4932e49efa7353c4d13d4f50f226fe8dcd4ba2fd3eba0ddb5e7a967aef3fadf0c2c919cf10007b3d0c79deeb7f52c088b1843849223296a057a4f7c
 AUX libsidplay-2.1.1-gcc41.patch 1063 BLAKE2B 464044df0215d8b4af5ec688b275a0841ae2aacf7db43996a46f3999e820fbfbad36c7215efe93b9026791462cff7caa9b7d65e3b4f32bdaed94fb222ab95731 SHA512 f27ec81273af62271903102f87f904c8031e1b7fef963714e8a4479ac4227ea9b881843782ced003b80461ec3e07d9be3f2d0e2ecb5ab38c73a8a2bd4e8cda72
 AUX libsidplay-2.1.1-gcc43.patch 2057 BLAKE2B b66469b17702fa74fffc6ec554696898767f20fd4fb01d1e8dff56a52f1ba699c103c9949db4e8da2b12a9920e3dfd0e53d82d3776c5609f0de9f79f82924dde SHA512 77078813d4862628372bf1293747c38d55811cc4c68ef3001252a520a89d83a91e1ba102f861825bb534039c4811bb8bbbea2e47609b5762ad2353477561d9ce
@@ -12,4 +13,5 @@ DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6b
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 766 BLAKE2B 33fb576676adfe11e1eb49fec9072fcbbb1200d6d1a084ce9332178529f798e74a37a16d2a47b15e18cb738af0d03830c865f00f7b583936357b8dbea92cd87a SHA512 54426f91c6bf5753f523e8a73154773396ddfb040315e91476e2dda2aa32641c1cf09258ed4777638f42779ac3e8732b8551e9ff9c582479201fa5e6a70885e9
 EBUILD libsidplay-2.1.1-r6.ebuild 1526 BLAKE2B 8915ac65a033fe9d6715577b0184a6f1729139c03815dd97ab2af1a0873fc3c3b98fb1ae61ab59b9123069781b41143bfa47b625d4cd9c6c3b5b55f10651cffd SHA512 57a84d4cc19ea0b5638cff0fbfb2554eeaab37a25759e4849e07eeafc3e2c55220c44cb158e23b64aeff44d6ca49e31ec994943eb5898a570c5d0da5574b1a84
+EBUILD libsidplay-2.1.1-r7.ebuild 1565 BLAKE2B cc39c028473b376fa1ac1915238c95f286fcaec2f8d988ca75b3524fdaded303ea406fd33d6c14ef6ba9a6abf06dc3eb4cf0f6f44014e80556a1ba0993476222 SHA512 fc8c4fc2b02affd068ce32dc3e4436d7a59c84c0d07c4ab5fa45d16e9f754e95a1ed8d6f25c73980bd23e689eb0fbda66e5abd5d28270c40772550ec88dd8c28
 MISC metadata.xml 246 BLAKE2B 5791eec1fea2211cdfa2d13a89732df17195754dddcb9122157536f9f398f783de194f304cc545db22ae0506f69cb13cb1b9e03449959edc96097b2f0eac2d13 SHA512 8f5558a12be53599ddda50ec08e80a33b37ee1f4c73048b4a02983121e22c149dca53abda7985c840aedc506a9945a66ef94e034f168d868b9933b8c5c2c9fdb
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-clang16.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-clang16.patch
new file mode 100644
index 000000000000..803cda92d56f
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-clang16.patch
@@ -0,0 +1,48 @@
+_Ios_Openmode is an implementation detail of the GNU c++ stdlib whereas
+ios_base::openmode is the portable way to go
+--- a/libsidplay/src/sidtune/SidTune.cpp
++++ b/libsidplay/src/sidtune/SidTune.cpp
+@@ -29,6 +29,7 @@
+ #   include <new>
+ #endif
+ #include <iostream>
++#include <ios>
+ #include <iomanip>
+ #include <string.h>
+ #include <limits.h>
+@@ -283,7 +284,7 @@ bool SidTune::loadFile(const char* fileName, Buffer_sidtt<const uint_least8_t>&
+     uint_least32_t fileLen = 0;
+ 
+     // This sucks big time
+-    std::_Ios_Openmode createAtrr = std::ios::in;
++    std::ios_base::openmode createAtrr = std::ios::in;
+ #ifdef HAVE_IOS_NOCREATE
+     createAtrr |= std::ios::nocreate;
+ #endif
+@@ -952,7 +953,7 @@ bool SidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
+     if ( status )
+     {
+         // Open binary output file stream.
+-        std::_Ios_Openmode createAttr = std::ios::out;
++        std::ios_base::openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+         createAttr |= std::ios::bin;
+ #else
+@@ -1002,7 +1003,7 @@ bool SidTune::saveSIDfile( const char* fileName, bool overWriteFlag )
+     if ( status )
+     {
+         // Open ASCII output file stream.
+-        std::_Ios_Openmode createAttr = std::ios::out;
++        std::ios_base::openmode createAttr = std::ios::out;
+         if ( overWriteFlag )
+             createAttr |= std::ios::trunc;
+         else
+@@ -1036,7 +1037,7 @@ bool SidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
+     if ( status )
+     {
+         // Open binary output file stream.
+-        std::_Ios_Openmode createAttr = std::ios::out;
++        std::ios_base::openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+         createAttr |= std::ios::bin;
+ #else
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild
new file mode 100644
index 000000000000..ef8c6ba46db3
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P=sidplay-libs-${PV}
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sidplay/sidconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-fbsd.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-no_libtool_reference.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	local subdirs=(
+		builders/hardsid-builder
+		builders/resid-builder
+		libsidplay
+		libsidutils
+		resid
+		.
+	)
+
+	for i in ${subdirs[@]}; do
+		(
+			cd "$i" || die
+			eautoreconf
+		)
+	done
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--with-pic
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	docinto libsidplay
+	dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO}
+
+	docinto libsidutils
+	dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO}
+
+	docinto resid
+	dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO}
+
+	doenvd "${FILESDIR}"/65resid
+
+	find "${D}" -name '*.la' -delete || die
+}