6 files changed, 8 insertions, 321 deletions
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ab48d8891556..102263693dd4 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,10 +1,6 @@
-AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
-AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
-DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8 SHA512 7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e556666281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
 DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d SHA512 5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
-EBUILD scummvm-2.2.0-r2.ebuild 3284 BLAKE2B 56f2c163028a473699af68c5d0707d7bbf3d7f3f077008d8e73272e65e55c0d6b59d4f1dd0ad63cb040c17b3e733157f35e4b2db0e42562e6970a2f6aedaf3ee SHA512 a2170c84373dc0c2905667a31f4ab2af67a3400afd7bd0ae5c142accf1151934a939b96084e5d3962ebd1679caaa7418dbc54b71cf9aba9004911ec21ff64077
-EBUILD scummvm-2.5.0.ebuild 3322 BLAKE2B c082f2094b7f9b6de04b1eb8d43c89864a669c6980c6667ce9df1c9258099abbe3854f2c99b53784aed42937a4772a3ed2ed1a367e8025d04739b6ef1ab46b6d SHA512 0977a604cc9ed27ac8c9ed4dbe4fb8908740ff0a66bd1bbb24f06941df2fc078f70cf9f5f2032e4a25b8bb1cadb77f586a93a5e6f436f560551ec09000d07517
+DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80 SHA512 6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
 EBUILD scummvm-2.5.1.ebuild 3322 BLAKE2B c082f2094b7f9b6de04b1eb8d43c89864a669c6980c6667ce9df1c9258099abbe3854f2c99b53784aed42937a4772a3ed2ed1a367e8025d04739b6ef1ab46b6d SHA512 0977a604cc9ed27ac8c9ed4dbe4fb8908740ff0a66bd1bbb24f06941df2fc078f70cf9f5f2032e4a25b8bb1cadb77f586a93a5e6f436f560551ec09000d07517
-EBUILD scummvm-9999.ebuild 3251 BLAKE2B 25f019b4a11fc075bf69d95f8b2ec56ea6335f5c58312a36b9f68f4c61cfe3f4a0416aa9a12f3db4d2b84b97b4153454667c1128ebf41d68bf6b52921066d870 SHA512 5c1ef273c8564a8fa128c21e72a506594e1f06a71873533feae91a05e1cbfea1d80cbbc8b9d0148797cb6efbe704ebdd16a88d93e7d36ee41e3df241b36c66a5
+EBUILD scummvm-2.6.0.ebuild 3263 BLAKE2B 23fc8e532540b863623bfa594f175a9165c3daef50e8752ce7d8b888681edff03cd0c497cdd445d15f8f5d7f5e843defd2d5a58bdcce82d1a2a0698641d167c4 SHA512 99fedb22cba0c4a4c73ac59ad80f78530d72cee98227f5b95251a16ffe82f485257e602e90fdb2864bd01c3e73830c65c4511f75c57ba606972e26cbe2d6f273
+EBUILD scummvm-9999.ebuild 3263 BLAKE2B 23fc8e532540b863623bfa594f175a9165c3daef50e8752ce7d8b888681edff03cd0c497cdd445d15f8f5d7f5e843defd2d5a58bdcce82d1a2a0698641d167c4 SHA512 99fedb22cba0c4a4c73ac59ad80f78530d72cee98227f5b95251a16ffe82f485257e602e90fdb2864bd01c3e73830c65c4511f75c57ba606972e26cbe2d6f273
 MISC metadata.xml 1215 BLAKE2B 87d954f59103b0bdc1300094f195638f44dee1ddfeaadc40dc515248fea7b3da553313a1a6e8478b5e7a827c8971da5a3a56756ae5fc01464af1e8295623db5c SHA512 1a5592562aabd4d78f22dbed63446593b6082b676fcae152b7f1e173c92972d89fa1d99cc759991db55e42670fc122aeb1b22b5c0e7defcb7a3bf68eaea110a7
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
deleted file mode 100644
index 8bb94ec6ab6e..000000000000
--- a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index e0d7c4e3df..d8e82c24f5 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -46,6 +46,14 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
- 
-+// We assume here Fluidsynth minor will never be above 255 and
-+// that micro versions won't break API compatibility
-+#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
-+#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | FLUIDSYNTH_VERSION_MINOR)
-+#else
-+#define FS_API_VERSION 0
-+#endif
-+
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:
- 	MidiChannel_MPU401 _midiChannels[16];
-@@ -75,7 +83,7 @@ public:
- 
- 	void setEngineSoundFont(Common::SeekableReadStream *soundFontData) override;
- 	bool acceptsSoundFontData() override {
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- 		return true;
- #else
- 		return false;
-@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const char *val) {
- 
- // Soundfont memory loader callback functions.
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- static void *SoundFontMemLoader_open(const char *filename) {
- 	void *p;
- 	if (filename[0] != '&') {
-@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char *filename) {
- 	return p;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) {
-+#else
- static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
-+#endif
- 	return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) {
-+#else
- static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
-+#endif
- 	return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
- }
- 
-@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
- 	return FLUID_OK;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
-+#else
- static long SoundFontMemLoader_tell(void *handle) {
-+#endif
- 	return ((Common::SeekableReadStream *) handle)->pos();
- }
- #endif
-@@ -166,7 +186,8 @@ int MidiDriver_FluidSynth::open() {
- 	if (_isOpen)
- 		return MERR_ALREADY_OPEN;
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+
-+#if FS_API_VERSION >= 0x0200
- 	// When provided with in-memory SoundFont data, only use the configured
- 	// SoundFont instead if it's explicitly configured on the current game.
- 	bool isUsingInMemorySoundFontData = _engineSoundFontData && !ConfMan.getActiveDomain()->contains("soundfont");
-@@ -195,7 +216,11 @@ int MidiDriver_FluidSynth::open() {
- 	_synth = new_fluid_synth(_settings);
- 
- 	if (ConfMan.getBool("fluidsynth_chorus_activate")) {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_chorus_on(_synth, -1, 1);
-+#else
- 		fluid_synth_set_chorus_on(_synth, 1);
-+#endif
- 
- 		int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr");
- 		double chorusLevel = (double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0;
-@@ -210,22 +235,49 @@ int MidiDriver_FluidSynth::open() {
- 			chorusType = FLUID_CHORUS_MOD_TRIANGLE;
- 		}
- 
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr);
-+		fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel);
-+		fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed);
-+		fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs);
-+		fluid_synth_set_chorus_group_type(_synth, -1, chorusType);
-+#else
- 		fluid_synth_set_chorus(_synth, chorusNr, chorusLevel, chorusSpeed, chorusDepthMs, chorusType);
-+#endif
- 	} else {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_chorus_on(_synth, -1, 0);
-+#else
- 		fluid_synth_set_chorus_on(_synth, 0);
-+#endif
- 	}
- 
- 	if (ConfMan.getBool("fluidsynth_reverb_activate")) {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_reverb_on(_synth, -1, 1);
-+#else
- 		fluid_synth_set_reverb_on(_synth, 1);
-+#endif
- 
- 		double reverbRoomSize = (double)ConfMan.getInt("fluidsynth_reverb_roomsize") / 100.0;
- 		double reverbDamping = (double)ConfMan.getInt("fluidsynth_reverb_damping") / 100.0;
- 		int reverbWidth = ConfMan.getInt("fluidsynth_reverb_width");
- 		double reverbLevel = (double)ConfMan.getInt("fluidsynth_reverb_level") / 100.0;
- 
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_set_reverb_group_roomsize(_synth, -1, reverbRoomSize);
-+		fluid_synth_set_reverb_group_damp(_synth, -1, reverbDamping);
-+		fluid_synth_set_reverb_group_width(_synth, -1, reverbWidth);
-+		fluid_synth_set_reverb_group_level(_synth, -1, reverbLevel);
-+#else
- 		fluid_synth_set_reverb(_synth, reverbRoomSize, reverbDamping, reverbWidth, reverbLevel);
-+#endif
- 	} else {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_reverb_on(_synth, -1, 0);
-+#else
- 		fluid_synth_set_reverb_on(_synth, 0);
-+#endif
- 	}
- 
- 	Common::String interpolation = ConfMan.get("fluidsynth_misc_interpolation");
-@@ -246,7 +298,7 @@ int MidiDriver_FluidSynth::open() {
- 	const char *soundfont = !isUsingInMemorySoundFontData ?
- 			ConfMan.get("soundfont").c_str() : Common::String::format("&%p", (void *)_engineSoundFontData).c_str();
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- 	if (isUsingInMemorySoundFontData) {
- 		fluid_sfloader_t *soundFontMemoryLoader = new_fluid_defsfloader(_settings);
- 		fluid_sfloader_set_callbacks(soundFontMemoryLoader,
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
deleted file mode 100644
index d73ad03820ea..000000000000
--- a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
-From: Paul Gilbert <dreammaster@scummvm.org>
-Date: Wed, 23 Sep 2020 19:10:17 -0700
-Subject: [PATCH] ULTIMA: Add lua as an engine dependency
-
----
- engines/ultima/configure.engine | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
-index 6447e3eb7f96..704a79d1f61f 100644
---- a/engines/ultima/configure.engine
-+++ b/engines/ultima/configure.engine
-@@ -1,3 +1,3 @@
- # This file is included from the main "configure" script
- # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
--add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
-+add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"
diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
deleted file mode 100644
index 22d247713dfa..000000000000
--- a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 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://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND="
-	>=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 )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:3
-	)
-	jpeg? ( virtual/jpeg:0 )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	net? (
-		media-libs/sdl2-net
-		net-misc/curl
-	)
-	opengl? ( || (
-		virtual/opengl
-		media-libs/mesa[gles2]
-		media-libs/mesa[gles1]
-	) )
-	png? ( media-libs/libpng:0 )
-	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
-	)
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
-	"${FILESDIR}/${P}-fluidsynth-2.2.patch"
-)
-
-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)
-		$(usex fluidsynth '' --disable-fluidsynth)
-		$(use_enable fribidi)
-		$(use_enable gtk)
-		$(use_enable jpeg)
-		$(use_enable lua)
-		$(use_enable mp3 mad)
-		$(use_enable mpeg2)
-		$(use_enable net libcurl)
-		$(use_enable net sdlnet)
-		$(use_enable png)
-		$(use_enable sndio)
-		$(use_enable speech tts)
-		$(use_enable theora theoradec)
-		$(use_enable truetype freetype2)
-		$(usex unsupported --enable-all-engines '')
-		$(use_enable vorbis)
-		$(use_enable zlib)
-		$(use_enable x86 nasm)
-	)
-	echo "configure ${myconf[@]}"
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	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.5.0.ebuild b/games-engines/scummvm/scummvm-2.6.0.ebuild
index 9f70736f67ee..820e36114b99 100644
--- a/games-engines/scummvm/scummvm-2.5.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
 		dev-libs/glib:2
 		x11-libs/gtk+:3
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
 	net? (
@@ -47,7 +47,6 @@ RDEPEND="
 			media-libs/mesa[gles2]
 			media-libs/mesa[gles1]
 		)
-		glew? ( media-libs/glew:0= )
 	)
 	png? ( media-libs/libpng:0 )
 	sndio? ( media-sound/sndio:= )
@@ -104,7 +103,6 @@ src_configure() {
 		$(usex fluidsynth '' --disable-fluidsynth)
 		$(use_enable fribidi)
 		$(use_enable gif)
-		$(use opengl && use_enable glew)
 		$(use_enable gtk)
 		$(use_enable jpeg)
 		$(use_enable lua)
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index fb4d5b239514..820e36114b99 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="
 		dev-libs/glib:2
 		x11-libs/gtk+:3
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
 	net? (