gentoo auto-resync : 12:12:2024 - 02:01:23

6 files changed, 197 insertions, 12 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 4b53dbc69561..e2f0f542619b 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index e8113fe02d39..925b6b107863 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -4,6 +4,7 @@ DIST scummvm-2.8.1.tar.xz 207711376 BLAKE2B 716503fbbd736e522918203400ccf777bc24
 DIST scummvm-2.9.0.tar.xz 219893788 BLAKE2B bb9af6016e4849220b873f35f091d31b9648c3e87b3838f6b4605dc727d2a37687e1d8993218715f3579b400eb11a29c52671136e16fac86415fcbbb87f0c016 SHA512 51236557f93052f2c6f840a135fa775ec4396cfbe618ee74259f29be7e0f0aa6b62d40920e3f03b92991794434ae44ef6f4a26a4615c5e27b362c1545e33b536
 EBUILD scummvm-2.8.0-r1.ebuild 3216 BLAKE2B b8c5e62c9e658a3be02d7aa5ebdf7608b5e894a7ae38e830d180c27c99bdf4a6ccda106b4485f5da2a2253d872e7cad38c29a2952d33357642ddba38ada01acb SHA512 2d1ac02a7a7dff08bba47ef29f1ea86895ae28631217fc0a0fe5542f4b85afb351974ff86d414833518fe9832840c81ab4b3b6bc86de31827fdf359b551d7d22
 EBUILD scummvm-2.8.1-r1.ebuild 3271 BLAKE2B 45015b16784c174d874ee6a325f39a473285cf0ffbe7ea61e700b0e5aec4a2b9258ff298563b88fa881af83e81f81b64ad630875fa36f42aee2b1b534ecfdaee SHA512 8e22b221a5b0efc48ae3d50f41c1d4cf30c6743e67760aef8a3fd9078251cc3106a86abb1b47749993d5db326ccbe5d3f941d664bad69e4e8f9e001bbad2e1f5
-EBUILD scummvm-2.9.0.ebuild 3216 BLAKE2B f9e7b5224ef26fbfe336b4ca4d7a234a0c8c0246d6c4b21ae2cecd7c99b876c94d1d644c67c099657b0be1ae4e393335091434ea32ebf8ac75036ad6bff622d3 SHA512 1f110d14f71728315428ebdd1693c122332de7809c23591f81428b910e22af7b001bffa963d5b50e0f941cebfda5d5093cfb021680221920c5e220bca2ebd0a4
-EBUILD scummvm-9999.ebuild 3216 BLAKE2B 88679a0b85c6e056267df0c7d8c3ba3a5eefdf33af24dbd05a358e605282034dfed6a41bf15051abbb1684834caf04c88b7db5a9468bb5d4d0e2010b102c5225 SHA512 e2bdbfa0f9b7b600386283d1ea0fdaac9f9a13d3c3da2c34d24156ad47cc27e0e7a293e179d4385eba9c869dbaccdfa45e22d8bfe88d2526a96387cf6672b5a8
-MISC metadata.xml 988 BLAKE2B 66ced0459606e6037ec74c63fd71605461b8910e9c9376969bf3487e8fdde8b3c7f85cdf3c054f32abd5f72bfe53de028db8d81a3c4c3da220b306f4e2a6eb27 SHA512 2b523111571ecc650a2723c3bbdd2877a33d9380cd7e67e37c556ac1e0cc26aef07ad2c04fab69f012e59c3fab6dd7d7385125e13e200683c4abd85ec1899e92
+EBUILD scummvm-2.9.0-r1.ebuild 3662 BLAKE2B 63cf795964829e963f76b16f8e9e59a3b3124d22d84ea2ea09e86f31b09499ccef3171dadb91d8bb611984495e3c5a1915923c80873521e40834d7575e34964a SHA512 9935ef4b49f803c49f40edbf7f82932606ecb7d64a17a08c69b640a21d01358c4f8ebfae034ba416d9ffc8e0ea80ac8819c0ebe8b2a7947373e5959755c5066b
+EBUILD scummvm-2.9.0.ebuild 3592 BLAKE2B c1e04af94706ce2b7b364dd689d8c3321db759b8a98c2511097d4d1a74b67d03bcd5aa614f800638861eb5325b85da6637356aa0c89618d1660bfc1c336fff9a SHA512 7eaf4424e978cebf69b1223b8bd2a70b586d87126e6d9536979e5a394da1fe4e006c377066ad9d576ce153cef36484fb6d2fbce9472fb2124136cdae3deeb491
+EBUILD scummvm-9999.ebuild 3669 BLAKE2B 010f3e975842c6cee15c3e55c5691aafc447f2e4e1bc593107e77ad269a1b8f83b0874561bde4e5f3ae1de6e04e8a0af138b877d4f94b9c4dcd8f722c61d5fc5 SHA512 bd2d0789529a8d494c7f7525bab35c3adcf0f34bd510d70e5eb1d46ba27c59dae79bc0a30d7a18ef96558da8201ff167e2abadcd1c84ba499147d6986c75d06a
+MISC metadata.xml 1282 BLAKE2B fe6a5ed7b932c45c8c031b5747015e8348fa1823899d70d95fddb2b672c8b46ae2dd99d50f667db3b5bcf980010ae2f69d2447f4e4a1745304149e1a543df500 SHA512 3c16cf1d4360c503dbedf3f847fc91dff51fe7516abdd4a179a69ae74b3205bf42cb4d7f85fedc4245d67b1969886e21643b4edb988342b961c8650ce09c01d1
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index 1e66116903bf..3b6346cbd8b6 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -14,8 +14,11 @@
     <flag name="fribidi">Support for right-to-left languages via <pkg>dev-libs/fribidi</pkg></flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
     <flag name="net">enable cloud support via <pkg>media-libs/sdl2-net</pkg></flag>
+    <flag name="openmpt">Enable mod/tracker music file support via <pkg>media-libs/libopenmpt</pkg></flag>
+    <flag name="parport">Enable parallel port support via <pkg>sys-libs/libieee1284</pkg></flag>
     <flag name="sndio">Enable support for MIDI music using <pkg>media-sound/sndio</pkg></flag>
     <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag>
+    <flag name="vpx">Enable VP8/VP9 codec support via <pkg>media-libs/libvpx</pkg></flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">scummvm</remote-id>
diff --git a/games-engines/scummvm/scummvm-2.9.0-r1.ebuild b/games-engines/scummvm/scummvm-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..2f694a89ed71
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.9.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
+HOMEPAGE="https://www.scummvm.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+else
+	SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	S=${WORKDIR}/${P/_/}
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="
+	a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+	mp3 musepack +net opengl openmpt parport png readline sndio speech
+	theora truetype unsupported vorbis vpx zlib
+"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+DEPEND="
+	>=media-libs/libsdl2-2.0.0[sound,joystick,video]
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	mp3? ( media-libs/libmad )
+	mpeg2? ( media-libs/libmpeg2 )
+	musepack? ( media-sound/musepack-tools:= )
+	net? (
+		media-libs/sdl2-net
+		net-misc/curl
+	)
+	opengl? (
+		|| (
+			virtual/opengl
+			media-libs/libglvnd
+		)
+	)
+	openmpt? ( media-libs/libopenmpt:= )
+	parport? ( sys-libs/libieee1284:= )
+	png? ( media-libs/libpng:0 )
+	readline? ( sys-libs/readline:= )
+	sndio? ( media-sound/sndio:= )
+	speech? ( app-accessibility/speech-dispatcher )
+	truetype? ( media-libs/freetype:2 )
+	theora? ( media-libs/libtheora )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	vpx? ( media-libs/libvpx:= )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-arch/xz-utils
+	truetype? ( virtual/pkgconfig )
+	x86? ( dev-lang/nasm )
+"
+
+src_prepare() {
+	default
+
+	# -g isn't needed for nasm here
+	sed -i \
+		-e '/NASMFLAGS/ s/-g//' \
+		configure || die
+	sed -i \
+		-e '/INSTALL.*doc/d' \
+		-e '/INSTALL.*\/pixmaps/d' \
+		-e 's/-s //' \
+		ports.mk || die
+}
+
+src_configure() {
+	use x86 && append-ldflags -Wl,-z,noexecstack
+	tc-export STRINGS
+
+	local myconf=(
+		--backend=sdl
+		--host=${CHOST}
+		--enable-verbose-build
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--opengl-mode=$(usex opengl auto none)
+		--with-sdl-prefix="${EPREFIX}/usr"
+		$(use_enable a52)
+		$(use_enable aac faad)
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable !debug release-mode)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fribidi)
+		$(use_enable gif)
+		$(use_enable gtk)
+		$(use_enable jpeg)
+		$(use_enable lua)
+		# it's exclusive to openmpt, and openmpt is preferred upstream
+		--disable-mikmod
+		$(use_enable mp3 mad)
+		$(use_enable mpeg2)
+		$(use_enable musepack mpcdec)
+		$(use_enable net libcurl)
+		$(use_enable net sdlnet)
+		$(use_enable openmpt)
+		$(use_enable parport opl2lpt)
+		$(use_enable png)
+		$(use_enable readline)
+		$(use_enable sndio)
+		$(use_enable speech tts)
+		--enable-text-console
+		$(use_enable theora theoradec)
+		$(use_enable truetype freetype2)
+		$(usex unsupported --enable-all-engines '')
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable zlib)
+		$(use_enable x86 nasm)
+	)
+	echo "configure ${myconf[@]}"
+	# not an autoconf script, so don't call econf
+	local -x SDL_CONFIG="sdl2-config"
+	./configure "${myconf[@]}" ${EXTRA_ECONF} || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR) cru" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+	doicon -s scalable icons/scummvm.svg
+}
diff --git a/games-engines/scummvm/scummvm-2.9.0.ebuild b/games-engines/scummvm/scummvm-2.9.0.ebuild
index 062895592e49..f0b6ffc68467 100644
--- a/games-engines/scummvm/scummvm-2.9.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.9.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
@@ -20,8 +21,8 @@ LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 IUSE="
 	a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
-	mp3 +net opengl png sndio speech theora truetype unsupported vorbis
-	zlib
+	mp3 musepack +net opengl openmpt png readline sndio speech theora
+	truetype unsupported vorbis vpx zlib
 "
 RESTRICT="test"  # it only looks like there's a test there #77507
 
@@ -41,6 +42,7 @@ DEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
+	musepack? ( media-sound/musepack-tools:= )
 	net? (
 		media-libs/sdl2-net
 		net-misc/curl
@@ -51,7 +53,9 @@ DEPEND="
 			media-libs/libglvnd
 		)
 	)
+	openmpt? ( media-libs/libopenmpt:= )
 	png? ( media-libs/libpng:0 )
+	readline? ( sys-libs/readline:= )
 	sndio? ( media-sound/sndio:= )
 	speech? ( app-accessibility/speech-dispatcher )
 	truetype? ( media-libs/freetype:2 )
@@ -60,6 +64,7 @@ DEPEND="
 		media-libs/libogg
 		media-libs/libvorbis
 	)
+	vpx? ( media-libs/libvpx:= )
 	zlib? ( sys-libs/zlib:= )
 "
 RDEPEND="
@@ -103,29 +108,36 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable !debug release-mode)
 		$(use_enable flac)
-		$(usex fluidsynth '' --disable-fluidsynth)
+		$(use_enable fluidsynth)
 		$(use_enable fribidi)
 		$(use_enable gif)
 		$(use_enable gtk)
 		$(use_enable jpeg)
 		$(use_enable lua)
+		# it's exclusive to openmpt, and openmpt is preferred upstream
+		--disable-mikmod
 		$(use_enable mp3 mad)
 		$(use_enable mpeg2)
+		$(use_enable musepack mpcdec)
 		$(use_enable net libcurl)
 		$(use_enable net sdlnet)
+		$(use_enable openmpt)
 		$(use_enable png)
+		$(use_enable readline)
 		$(use_enable sndio)
 		$(use_enable speech tts)
+		--enable-text-console
 		$(use_enable theora theoradec)
 		$(use_enable truetype freetype2)
 		$(usex unsupported --enable-all-engines '')
 		$(use_enable vorbis)
+		$(use_enable vpx)
 		$(use_enable zlib)
 		$(use_enable x86 nasm)
 	)
 	echo "configure ${myconf[@]}"
 	# not an autoconf script, so don't call econf
-	SDL_CONFIG="sdl2-config" \
+	local -x SDL_CONFIG="sdl2-config"
 	./configure "${myconf[@]}" ${EXTRA_ECONF} || die
 }
 
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index 826f0cc2b782..db2d168193f0 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
@@ -20,8 +21,8 @@ LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 IUSE="
 	a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
-	mp3 +net opengl png sndio speech theora truetype unsupported vorbis
-	zlib
+	mp3 musepack +net opengl openmpt parport png readline sndio speech
+	theora truetype unsupported vorbis vpx zlib
 "
 RESTRICT="test"  # it only looks like there's a test there #77507
 
@@ -41,6 +42,7 @@ DEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
+	musepack? ( media-sound/musepack-tools:= )
 	net? (
 		media-libs/sdl2-net
 		net-misc/curl
@@ -51,7 +53,10 @@ DEPEND="
 			media-libs/libglvnd
 		)
 	)
+	openmpt? ( media-libs/libopenmpt:= )
+	parport? ( sys-libs/libieee1284:= )
 	png? ( media-libs/libpng:0 )
+	readline? ( sys-libs/readline:= )
 	sndio? ( media-sound/sndio:= )
 	speech? ( app-accessibility/speech-dispatcher )
 	truetype? ( media-libs/freetype:2 )
@@ -60,6 +65,7 @@ DEPEND="
 		media-libs/libogg
 		media-libs/libvorbis
 	)
+	vpx? ( media-libs/libvpx:= )
 	zlib? ( sys-libs/zlib:= )
 "
 RDEPEND="
@@ -103,29 +109,37 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable !debug release-mode)
 		$(use_enable flac)
-		$(usex fluidsynth '' --disable-fluidsynth)
+		$(use_enable fluidsynth)
 		$(use_enable fribidi)
 		$(use_enable gif)
 		$(use_enable gtk)
 		$(use_enable jpeg)
 		$(use_enable lua)
+		# it's exclusive to openmpt, and openmpt is preferred upstream
+		--disable-mikmod
 		$(use_enable mp3 mad)
 		$(use_enable mpeg2)
+		$(use_enable musepack mpcdec)
 		$(use_enable net libcurl)
 		$(use_enable net sdlnet)
+		$(use_enable openmpt)
+		$(use_enable parport opl2lpt)
 		$(use_enable png)
+		$(use_enable readline)
 		$(use_enable sndio)
 		$(use_enable speech tts)
+		--enable-text-console
 		$(use_enable theora theoradec)
 		$(use_enable truetype freetype2)
 		$(usex unsupported --enable-all-engines '')
 		$(use_enable vorbis)
+		$(use_enable vpx)
 		$(use_enable zlib)
 		$(use_enable x86 nasm)
 	)
 	echo "configure ${myconf[@]}"
 	# not an autoconf script, so don't call econf
-	SDL_CONFIG="sdl2-config" \
+	local -x SDL_CONFIG="sdl2-config"
 	./configure "${myconf[@]}" ${EXTRA_ECONF} || die
 }