commit: de3e041e1047b8474bc603aa270af0a18ab05157 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Fri Nov 24 13:05:29 2023 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Fri Nov 24 13:07:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3e041e
games-engines/scummvm-tools: add 2.7.0_p1 Closes: https://bugs.gentoo.org/858734 Closes: https://bugs.gentoo.org/906876 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> games-engines/scummvm-tools/Manifest | 3 + .../files/scummvm-tools-2.7.0-endianess.patch | 27 ++++++++ games-engines/scummvm-tools/metadata.xml | 3 + .../scummvm-tools/scummvm-tools-2.7.0_p1.ebuild | 81 ++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest index c42f54febae1..04fcb1ff0575 100644 --- a/games-engines/scummvm-tools/Manifest +++ b/games-engines/scummvm-tools/Manifest @@ -1 +1,4 @@ DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89 +DIST scummvm-tools-2.7.0.tar.xz 1286572 BLAKE2B bcb58267a9c04849ab3145f2d5a657b9e1ec6c2bb9e59bbf47ae6aae842385e70d0417f92ca4018786cf91f8c607a5fe1246f846dc496318b01ec51bd059358b SHA512 0f6541f86814a089b10969e8e0cc8c985ac4d3b5f15daf91869a9b9cc748d7b6c668ffd428c1f0726ff9a1fb5cc7b496098481778cbf41203a7eb3077a189ce7 +DIST scummvm-tools_2.7.0-1.debian.tar.xz 10212 BLAKE2B 9805222166f30d1535642958ac74984968dd19bfa3b7a159b61509215fd29d370a9393d0a25e4dfd041ee83feb9fffb55f5f705d76ac03de95d925718166c263 SHA512 f7234e58312f7979b9f87940020d9815429a24be6083e8ed61ef14c342c83edfb00f2f9d130e2a18b34099c3a20df3093556b017f28a40a1f8d8037ad8d99bed +DIST scummvm-tools_512.png 56989 BLAKE2B 8173b580a542d78a4dcb859f8ba008af8f5dcd707c6213a3fc961dc5f8bbe02f3e67beafbaceff8ffb75a26d0a1c441642a103c1607b7c776b6da6c803545a47 SHA512 94d0cd2ccb7ac7ea1ca20ba208908ac05e064470f260e3347aec2aa457f1cf281c6bc88056e14001a1f93422f9cdfb732c53262d8067a4c487a57396b510fd7f diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.7.0-endianess.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.7.0-endianess.patch new file mode 100644 index 000000000000..6752914d2c2b --- /dev/null +++ b/games-engines/scummvm-tools/files/scummvm-tools-2.7.0-endianess.patch @@ -0,0 +1,27 @@ +# https://src.fedoraproject.org/rpms/scummvm-tools/raw/rawhide/f/configure.patch +diff -uNr scummvm-tools-2.5.0.old/configure scummvm-tools-2.5.0/configure +--- scummvm-tools-2.5.0.old/configure 2021-10-01 13:59:48.000000000 +0200 ++++ scummvm-tools-2.5.0/configure 2021-12-14 23:01:39.604582839 +0100 +@@ -1047,15 +1047,15 @@ + # + echo_n "Checking endianness... " + cat > tmp_endianness_check.cpp << EOF +-unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +-unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +-void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; } +-unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +-unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +-void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; } ++__attribute__ ((used)) unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++__attribute__ ((used)) unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++__attribute__ ((used)) void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; } ++__attribute__ ((used)) unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++__attribute__ ((used)) unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++__attribute__ ((used)) void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; } + int main() { _ascii (); _ebcdic (); return 0; } + EOF +-$CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp ++$CXX $CXXFLAGS -ffat-lto-objects -c -o $TMPO.o tmp_endianness_check.cpp + if $_strings $TMPO.o | grep BIGenDianSyS >/dev/null; then + _endian=big + elif $_strings $TMPO.o | grep LiTTleEnDian >/dev/null; then diff --git a/games-engines/scummvm-tools/metadata.xml b/games-engines/scummvm-tools/metadata.xml index e6b8e4e911e0..798292735601 100644 --- a/games-engines/scummvm-tools/metadata.xml +++ b/games-engines/scummvm-tools/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="sourceforge">scummvm</remote-id> </upstream> + <use> + <flag name="tremor">Enable tremor, a fixed-point version of the Ogg Vorbis decoder</flag> + </use> </pkgmetadata> diff --git a/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild new file mode 100644 index 000000000000..d06380eb0491 --- /dev/null +++ b/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +WX_GTK_VER="3.2-gtk3" + +inherit desktop toolchain-funcs wxwidgets xdg + +DESCRIPTION="Utilities for the SCUMM game engine" +HOMEPAGE="https://www.scummvm.org/"; +SRC_URI="https://www.scummvm.org/frs/scummvm-tools/${PV/_p*}/${P/_p*}.tar.xz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz + https://dev.gentoo.org/~pacho/${PN}/${PN}_512.png"; +S="${WORKDIR}/${P/_p*}" + +LICENSE="GPL-3+ LGPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="flac iconv mad png tremor vorbis" + +RDEPEND=" + dev-libs/boost:= + sys-libs/zlib + x11-libs/wxGTK:${WX_GTK_VER} + flac? ( media-libs/flac:= ) + iconv? ( + virtual/libiconv + media-libs/freetype:2 ) + mad? ( media-libs/libmad ) + png? ( media-libs/libpng:= ) + tremor? ( media-libs/tremor ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + # Endianess patch synced with Fedora + "${FILESDIR}/${PN}-2.7.0-endianess.patch" +) + +src_prepare() { + default + + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done +} + +src_configure() { + setup-wxwidgets + tc-export CXX STRINGS + + # Not an autoconf script + ./configure \ + --enable-verbose-build \ + --mandir="${EPREFIX}/usr/share/man" \ + --prefix="${EPREFIX}/usr" \ + $(use_enable flac) \ + $(use_enable iconv) \ + $(use_enable iconv freetype2) \ + $(use_enable mad) \ + $(use_enable png) \ + $(use_enable tremor) \ + $(use_enable vorbis) || die +} + +src_install() { + default + cd "${ED}"/usr/bin || die + for i in $(ls * | grep -v scummvm-tools) ; do + mv ${i} ${PN}-${i} || die + done + + make_desktop_entry ${PN} "ScummVM Tools" ${PN} "Game;AdventureGame;" + newicon -s 128 "${S}"/gui/media/scummvmtools_128.png ${PN}.png + newicon -s 512 "${DISTDIR}"/${PN}_512.png ${PN}.png +}
![https://dev.gentoo.org/~pacho/${PN}/${PN}_512.png"](https://dev.gentoo.org/~pacho/${PN}/${PN}_512.png"){kind=link}