-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-engines/scummvm-tools: Update to version 2.7.0
Prevent the annoying double "scummvm-tools-scummvm-tools*" bin renaming and change the wxGTK bin to "scummvm-tools-gui" to correspond to "scummvm-tools-cli". Signed-off-by: Alan Swanson <reiver@improbability.net>
- Loading branch information
1 parent
20592be
commit 1529e3e
Showing
4 changed files
with
177 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
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 |
12 changes: 12 additions & 0 deletions
12
games-engines/scummvm-tools/files/scummvm-tools-2.7.0-binprefix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff -ur scummvm-tools-2.7.0/Makefile.common scummvm-tools-2.7.0-binprefix/Makefile.common | ||
--- scummvm-tools-2.7.0/Makefile.common 2023-02-15 20:41:02.000000000 +0000 | ||
+++ scummvm-tools-2.7.0-binprefix/Makefile.common 2023-08-08 11:31:53.127935435 +0100 | ||
@@ -483,7 +483,7 @@ | ||
install: $(TARGETS) | ||
$(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR) | ||
$(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools | ||
- for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done | ||
+ for i in $^ ; do if [[ $$i =~ "${EXEPREFIX}" ]] ; then $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; else $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR)/$(EXEPREFIX)$$i ; fi ; done | ||
$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools | ||
$(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools | ||
|
97 changes: 97 additions & 0 deletions
97
games-engines/scummvm-tools/files/scummvm-tools-2.7.0-guisuffix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
diff -ur scummvm-tools-2.7.0/Makefile scummvm-tools-2.7.0-guisuffix/Makefile | ||
--- scummvm-tools-2.7.0/Makefile 2023-02-15 20:41:02.000000000 +0000 | ||
+++ scummvm-tools-2.7.0-guisuffix/Makefile 2023-08-08 11:07:17.100560993 +0100 | ||
@@ -130,7 +130,7 @@ | ||
$(STRIP) grim_til2bmp$(EXEEXT) -o $(WIN32PATH)/tools/grim_til2bmp$(EXEEXT) | ||
$(STRIP) grim_vima$(EXEEXT) -o $(WIN32PATH)/tools/grim_vima$(EXEEXT) | ||
ifeq "$(USE_WXWIDGETS)" "1" | ||
- $(STRIP) scummvm-tools$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools$(EXEEXT) | ||
+ $(STRIP) scummvm-tools-gui$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools-gui$(EXEEXT) | ||
endif | ||
$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools-cli$(EXEEXT) | ||
cp $(srcdir)/*.bat $(WIN32PATH)/tools | ||
@@ -194,7 +194,7 @@ | ||
$(STRIP) grim_til2bmp$(EXEEXT) -o $(srcdir)/$(WIN32BUILD)/tools/grim_til2bmp$(EXEEXT) | ||
$(STRIP) grim_vima$(EXEEXT) -o $(srcdir)/$(WIN32BUILD)/tools/grim_vima$(EXEEXT) | ||
ifeq "$(USE_WXWIDGETS)" "1" | ||
- $(STRIP) scummvm-tools$(EXEEXT) -o $(srcdir)/$(WIN32BUILD)/scummvm-tools$(EXEEXT) | ||
+ $(STRIP) scummvm-tools-gui$(EXEEXT) -o $(srcdir)/$(WIN32BUILD)/scummvm-tools-gui$(EXEEXT) | ||
endif | ||
$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(srcdir)/$(WIN32BUILD)/scummvm-tools-cli$(EXEEXT) | ||
makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/win32/scummvm-tools.nsi | ||
@@ -226,8 +226,8 @@ | ||
|
||
|
||
# Special target to create a static linked binaries for Mac OS X. | ||
-scummvm-tools-static: $(scummvm-tools_OBJS) | ||
- $(CXX) $(LDFLAGS) -o scummvm-tools-static $(scummvm-tools_OBJS) \ | ||
+scummvm-tools-gui-static: $(scummvm-tools-gui_OBJS) | ||
+ $(CXX) $(LDFLAGS) -o scummvm-tools-gui-static $(scummvm-tools-gui_OBJS) \ | ||
-framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI \ | ||
$(WXSTATICLIBS) $(OSX_STATIC_LIBS) | ||
|
||
@@ -237,7 +237,7 @@ | ||
$(OSX_STATIC_LIBS) | ||
|
||
bundle_name = ScummVM\ Tools.app | ||
-bundle: scummvm-tools-static | ||
+bundle: scummvm-tools-gui-static | ||
mkdir -p $(bundle_name) | ||
mkdir -p $(bundle_name)/Contents | ||
mkdir -p $(bundle_name)/Contents/MacOS | ||
@@ -245,7 +245,7 @@ | ||
echo "APPL????" > $(bundle_name)/Contents/PkgInfo | ||
cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/ | ||
cp $(srcdir)/gui/media/*.* $(bundle_name)/Contents/Resources | ||
- cp scummvm-tools-static $(bundle_name)/Contents/MacOS/scummvm-tools | ||
+ cp scummvm-tools-gui-static $(bundle_name)/Contents/MacOS/scummvm-tools-gui | ||
|
||
# Special target to create a snapshot disk image for Mac OS X | ||
osxsnap: bundle scummvm-tools-cli-static | ||
@@ -312,7 +312,7 @@ | ||
$(STRIP) extract_ngi$(EXEEXT) -o $(AMIGAOSPATH)/extract_ngi$(EXEEXT) | ||
$(STRIP) gob_loadcalc$(EXEEXT) -o $(AMIGAOSPATH)/gob_loadcalc$(EXEEXT) | ||
ifeq "$(USE_WXWIDGETS)" "1" | ||
- $(STRIP) scummvm-tools$(EXEEXT) -o $(AMIGAOSPATH)/scummvm-tools$(EXEEXT) | ||
+ $(STRIP) scummvm-tools-gui$(EXEEXT) -o $(AMIGAOSPATH)/scummvm-tools-gui$(EXEEXT) | ||
endif | ||
$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(AMIGAOSPATH)/scummvm-tools-cli$(EXEEXT) | ||
$(STRIP) extract_hadesch$(EXEEXT) -o $(AMIGAOSPATH)/extract_hadesch$(EXEEXT) | ||
diff -ur scummvm-tools-2.7.0/Makefile.common scummvm-tools-2.7.0-guisuffix/Makefile.common | ||
--- scummvm-tools-2.7.0/Makefile.common 2023-02-15 20:41:02.000000000 +0000 | ||
+++ scummvm-tools-2.7.0-guisuffix/Makefile.common 2023-08-08 11:04:15.106859869 +0100 | ||
@@ -76,7 +76,7 @@ | ||
|
||
ifdef USE_WXWIDGETS | ||
PROGRAMS += \ | ||
- scummvm-tools | ||
+ scummvm-tools-gui | ||
endif | ||
|
||
ifdef MACOSX | ||
@@ -386,14 +386,14 @@ | ||
encode_dxa.o | ||
endif | ||
|
||
-scummvm-tools_OBJS := \ | ||
+scummvm-tools-gui_OBJS := \ | ||
gui/configuration.o \ | ||
gui/gui_tools.o \ | ||
gui/main.o \ | ||
gui/pages.o \ | ||
$(tools_OBJS) \ | ||
$(OBJS) | ||
-scummvm-tools_LIBS := $(WXLIBS) $(LIBS) | ||
+scummvm-tools-gui_LIBS := $(WXLIBS) $(LIBS) | ||
|
||
# Set custom build flags for various files | ||
gui/configuration.o: CPPFLAGS+=$(WXINCLUDES) | ||
@@ -448,7 +448,7 @@ | ||
version.o: $(filter-out version.o,$(degob_OBJS)) | ||
version.o: $(filter-out version.o,$(scummvm-tools-cli_OBJS)) | ||
ifdef USE_WXWIDGETS | ||
-version.o: $(filter-out version.o,$(scummvm-tools_OBJS)) | ||
+version.o: $(filter-out version.o,$(scummvm-tools-gui_OBJS)) | ||
endif | ||
version.o: $(filter-out version.o,$(detwine_OBJS)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
# Copyright 1999-2023 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=8 | ||
|
||
WX_GTK_VER=3.0-gtk3 | ||
inherit wxwidgets toolchain-funcs | ||
|
||
DESCRIPTION="Utilities for the SCUMM game engine" | ||
HOMEPAGE="https://www.scummvm.org/" | ||
SRC_URI="https://www.scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz" | ||
|
||
LICENSE="GPL-3" | ||
SLOT="0" | ||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" | ||
IUSE="flac iconv mad png vorbis" | ||
RESTRICT="test" # some tests require external files | ||
|
||
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:= ) | ||
vorbis? ( media-libs/libvorbis ) | ||
" | ||
DEPEND=" | ||
${RDEPEND} | ||
" | ||
BDEPEND=" | ||
virtual/pkgconfig | ||
" | ||
|
||
PATCHES=( | ||
"${FILESDIR}/${PN}-2.7.0-guisuffix.patch" | ||
"${FILESDIR}/${PN}-2.7.0-binprefix.patch" | ||
) | ||
|
||
src_prepare() { | ||
default | ||
|
||
rm -r *.bat dists/win32 || die | ||
} | ||
|
||
src_configure() { | ||
setup-wxwidgets | ||
tc-export CXX STRINGS | ||
|
||
# Not an autoconf script | ||
./configure \ | ||
--disable-tremor \ | ||
--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 vorbis) || die | ||
} | ||
|
||
src_install() { | ||
EXEPREFIX="${PN}-" default | ||
} |