commit: bf65f70fe2c0813ba32070d0811224b6208631cf Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat May 10 05:09:28 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat May 10 07:41:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf65f70f
games-engines/scummvm: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> games-engines/scummvm/Manifest | 2 - .../files/scummvm-2.8.1-freetype-2.13.3.patch | 59 -------- games-engines/scummvm/scummvm-2.8.0-r1.ebuild | 141 ------------------- games-engines/scummvm/scummvm-2.8.1-r1.ebuild | 145 ------------------- games-engines/scummvm/scummvm-2.9.0.ebuild | 153 --------------------- 5 files changed, 500 deletions(-) diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index 2b11e655e284..ecdc82614a38 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,3 +1 @@ -DIST scummvm-2.8.0.tar.xz 207362400 BLAKE2B 2e0354189bfa50b5af87c9019400c114c7fd3072afeb6cee50c230d27171ae109552c855b07f027769c10f6f325dafd77c56fa17b1c5a61b11ece3c1f54efe53 SHA512 e4e728a668fe3c1b161b56ff788011673766e7429bc27bafb2b4a7f724093b719f7fd47f0995f1db5dad42ecf3ee260fe51d549f85eb2a68862b799962c34632 -DIST scummvm-2.8.1.tar.xz 207711376 BLAKE2B 716503fbbd736e522918203400ccf777bc24a8e43c8c030c0e86d9c4f3c3da3f0c580269781fe030901e06854d43e2ed2f6ec9bc4e269c4d4dde8d3e08f494f2 SHA512 aef6c7b83f087cf0742dcd1f896f5706e2408e54c4c902e75f03e69f4c5475b1d33a2149246646afb96c02aa2e85ba93995dff732b3aa84338b7bc96c62b802c DIST scummvm-2.9.0.tar.xz 219893788 BLAKE2B bb9af6016e4849220b873f35f091d31b9648c3e87b3838f6b4605dc727d2a37687e1d8993218715f3579b400eb11a29c52671136e16fac86415fcbbb87f0c016 SHA512 51236557f93052f2c6f840a135fa775ec4396cfbe618ee74259f29be7e0f0aa6b62d40920e3f03b92991794434ae44ef6f4a26a4615c5e27b362c1545e33b536 diff --git a/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch b/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch deleted file mode 100644 index 3498c17857e0..000000000000 --- a/games-engines/scummvm/files/scummvm-2.8.1-freetype-2.13.3.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/938014 -https://github.com/scummvm/scummvm/pull/6046 - -From 391aa847c20bae4827fd8e868267a0cf4fc72df4 Mon Sep 17 00:00:00 2001 -From: antoniou79 <[email protected]> -Date: Wed, 14 Aug 2024 22:50:32 +0300 -Subject: [PATCH] AGS: Support for FreeType 2.13.3 changes to FT_Outline struct - -FreeType 2.13.3 changed a few types of the struct members for FT_Outline struct to unsigned - -This is the relevant commit from the FreeType source (github): -https://github.com/freetype/freetype/commit/2a7bb4596f566a34fd53932af0ef53b956459d25 ---- a/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp -+++ b/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp -@@ -296,7 +296,11 @@ void ah_outline_save(AH_Outline outline, AH_Loader gloader) { - AH_Point point = outline->points; - AH_Point point_limit = point + outline->num_points; - FT_Vector *vec = gloader->current.outline.points; -+#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 - char *tag = gloader->current.outline.tags; -+#else -+ unsigned char *tag = gloader->current.outline.tags; -+#endif - - /* we assume that the glyph loader has already been checked for storage */ - for (; point < point_limit; point++, vec++, tag++) { -@@ -408,8 +412,11 @@ FT_Error ah_outline_load(AH_Outline outline, FT_Face face) { - - /* compute Bezier flags */ - { -+#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 - char *tag = source->tags; -- -+#else -+ unsigned char *tag = source->tags; -+#endif - for (point = points; point < point_limit; point++, tag++) { - switch (FT_CURVE_TAG(*tag)) { - case FT_CURVE_TAG_CONIC: -@@ -457,12 +464,17 @@ FT_Error ah_outline_load(AH_Outline outline, FT_Face face) { - { - AH_Point *contour = outline->contours; - AH_Point *contour_limit = contour + outline->num_contours; -+#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 - short *end = source->contours; - short idx = 0; -+#else -+ unsigned short *end = source->contours; -+ unsigned short idx = 0; -+#endif - - for (; contour < contour_limit; contour++, end++) { - contour[0] = points + idx; -- idx = (short)(end[0] + 1); -+ idx = end[0] + 1; - } - } - - diff --git a/games-engines/scummvm/scummvm-2.8.0-r1.ebuild b/games-engines/scummvm/scummvm-2.8.0-r1.ebuild deleted file mode 100644 index 9adbe73bf3b8..000000000000 --- a/games-engines/scummvm/scummvm-2.8.0-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2023 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 ~riscv ~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 +net opengl png sndio speech theora truetype unsupported vorbis - 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 ) - net? ( - media-libs/sdl2-net - net-misc/curl - ) - opengl? ( - || ( - virtual/opengl - media-libs/libglvnd - ) - ) - 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:= ) -" -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) - $(usex fluidsynth '' --disable-fluidsynth) - $(use_enable fribidi) - $(use_enable gif) - $(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 don't 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.8.1-r1.ebuild b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild deleted file mode 100644 index 2d7c8e7c8b65..000000000000 --- a/games-engines/scummvm/scummvm-2.8.1-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# 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 ~riscv ~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 +net opengl png sndio speech theora truetype unsupported vorbis - 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 ) - net? ( - media-libs/sdl2-net - net-misc/curl - ) - opengl? ( - || ( - virtual/opengl - media-libs/libglvnd - ) - ) - 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:= ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - app-arch/xz-utils - truetype? ( virtual/pkgconfig ) - x86? ( dev-lang/nasm ) -" - -PATCHES=( - "${FILESDIR}"/${P}-freetype-2.13.3.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 gif) - $(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 don't 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.9.0.ebuild b/games-engines/scummvm/scummvm-2.9.0.ebuild deleted file mode 100644 index f0b6ffc68467..000000000000 --- a/games-engines/scummvm/scummvm-2.9.0.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# 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 ~riscv ~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 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:= ) - 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 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 -}
