diff --git a/games-engines/scummvm-tools/patches/scummvm_tools-1.7.0.patch b/games-engines/scummvm-tools/patches/scummvm_tools-1.7.0.patch deleted file mode 100644 index eb48ce9b1..000000000 --- a/games-engines/scummvm-tools/patches/scummvm_tools-1.7.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scummvm-tools-1.7.0/common/scummsys.h.org 2014-08-27 18:57:23.353894400 +0200 -+++ scummvm-tools-1.7.0/common/scummsys.h 2014-08-27 18:56:44.318767104 +0200 -@@ -85,7 +85,7 @@ - - #endif - -- #if defined(__QNXNTO__) -+ #if defined(__QNXNTO__) || defined (__HAIKU__) - #include /* For strcasecmp */ - #endif - diff --git a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe deleted file mode 100644 index b28b33dc7..000000000 --- a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY="Tools for ScummVM" -DESCRIPTION="This is a collection of various tools that may be useful to use \ -in conjunction with ScummVM. Please note that although a tool may support a \ -feature, certain ScummVM versions may not. ScummVM 0.6.x does not support \ -FLAC audio, for example." -HOMEPAGE="http://scummvm.org" -COPYRIGHT="2001-2013 ScummVM Team" -LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="http://sourceforge.net/projects/scummvm/files/scummvm-tools/1.7.0/scummvm-tools-1.7.0.tar.gz" -CHECKSUM_SHA256="6437cc87d5a0c81fe971c96059670e662e72141b53ee61923d374b5660997cbc" -SOURCE_DIR="scummvm-tools-1.7.0" -PATCHES="scummvm_tools-1.7.0.patch" - -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" - -PROVIDES=" - cmd:construct_mohawk = $portVersion - cmd:decine = $portVersion - cmd:degob = $portVersion - cmd:dekyra = $portVersion - cmd:deriven = $portVersion - cmd:descumm = $portVersion - cmd:desword2 = $portVersion - cmd:extract_mohawk = $portVersion - cmd:gob_loadcalc = $portVersion - cmd:scummvm_tools_cli = $portVersion - cmd:create_sjisfnt = $portVersion - " -REQUIRES=" - haiku - lib:libvorbis - lib:libogg - lib:libFLAC - lib:libmad - lib:libpng - lib:libz - lib:libfreetype - lib:libiconv - lib:libbz2 - " - -BUILD_REQUIRES=" - haiku_devel - devel:libvorbis - devel:libogg - devel:libFLAC - devel:libmad - devel:libpng - devel:libz - devel:libfreetype - devel:libiconv - devel:libbz2 - " -BUILD_PREREQUIRES=" - cmd:make - cmd:gcc - cmd:ld - cmd:pkg_config - cmd:libtoolize - " - -BUILD() -{ - ./configure --prefix=$prefix --datadir=$dataDir - make $jobArgs -} - -INSTALL() -{ - make install - #data files are not needed as long as we don't have a graphical interface for the tools - rm -r $dataDir/scummvm-tools -} diff --git a/games-engines/scummvm-tools/scummvm_tools-1.8.0.recipe b/games-engines/scummvm-tools/scummvm_tools-1.9.0.recipe similarity index 87% rename from games-engines/scummvm-tools/scummvm_tools-1.8.0.recipe rename to games-engines/scummvm-tools/scummvm_tools-1.9.0.recipe index 4444a8b5c..cac47b788 100644 --- a/games-engines/scummvm-tools/scummvm_tools-1.8.0.recipe +++ b/games-engines/scummvm-tools/scummvm_tools-1.9.0.recipe @@ -3,20 +3,20 @@ DESCRIPTION="This is a collection of various tools that may be useful to use \ in conjunction with ScummVM. Please note that although a tool may support a \ feature, certain ScummVM versions may not. ScummVM 0.6.x does not support \ FLAC audio, for example." -HOMEPAGE="http://scummvm.org" +HOMEPAGE="https://www.scummvm.org/" COPYRIGHT="2001-2013 ScummVM Team" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="http://scummvm.org/frs/scummvm-tools/1.8.0/scummvm-tools-1.8.0.tar.xz" -CHECKSUM_SHA256="2c14050cee3fb8e178cb9ff16a4412ab584001757b4824c75b24240eb2d98bdd" -SOURCE_DIR="scummvm-tools-1.8.0" -#PATCHES="scummvm_tools-1.7.0.patch" +SOURCE_URI="http://www.scummvm.org/frs/scummvm-tools/$portVersion/scummvm-tools-$portVersion.tar.xz" +CHECKSUM_SHA256="b7ab2e03c5a0efb71bb0c84434aa481331739b2b8759361d467e076b8410f938" +SOURCE_DIR="scummvm-tools-$portVersion" ARCHITECTURES="!x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" cmd:construct_mohawk = $portVersion + cmd:create_sjisfnt = $portVersion cmd:decine = $portVersion cmd:degob = $portVersion cmd:dekyra = $portVersion @@ -26,7 +26,6 @@ PROVIDES=" cmd:extract_mohawk = $portVersion cmd:gob_loadcalc = $portVersion cmd:scummvm_tools_cli = $portVersion - cmd:create_sjisfnt = $portVersion " REQUIRES=" haiku$secondaryArchSuffix diff --git a/games-engines/scummvm/additional-files/scummvm.rdef b/games-engines/scummvm/additional-files/scummvm.rdef.in similarity index 100% rename from games-engines/scummvm/additional-files/scummvm.rdef rename to games-engines/scummvm/additional-files/scummvm.rdef.in diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe deleted file mode 100644 index fd7e0ff69..000000000 --- a/games-engines/scummvm/scummvm-1.6.0.recipe +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY="Script Creation Utility for Maniac Mansion Virtual Machine" -DESCRIPTION="ScummVM is a program which allows you to run certain classic \ -graphical point-and-click adventure games, provided you already have their \ -data files. The clever part about this: ScummVM just replaces the executables \ -shipped with the games, allowing you to play them on systems for which they \ -were never designed!" -HOMEPAGE="http://scummvm.org" -COPYRIGHT="2001-2013 ScummVM Team" -LICENSE="GNU GPL v2" -REVISION="4" -SOURCE_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download" -CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4" - -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - scummvm$secondaryArchSuffix = $portVersion - app:scummvm$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libfaad$secondaryArchSuffix - lib:libFLAC++$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libfluidsynth$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - lib:libmad$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - lib:libSDL$secondaryArchSuffix - lib:libtheora$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfaad$secondaryArchSuffix - devel:libFLAC++$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libfluidsynth$secondaryArchSuffix - devel:libGL$secondaryArchSuffix - devel:libglu$secondaryArchSuffix - devel:libmad$secondaryArchSuffix - devel:libogg$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - devel:libSDL$secondaryArchSuffix - devel:libtheora$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:git - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:nasm - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - libtoolize --force --copy --install - CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix \ - --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \ - --mandir=$manDir --docdir=$docDir \ - --disable-debug --enable-release #--disable-all-engines - #the default build doesn't build all engines, those that are still under - #construction can be built with --enable-all-engines for testing purposes - #--disable-all-engines can be used to only compile scummvm without - #engines, which makes it build faster - - make $jobArgs -} - -INSTALL() -{ - make install - - addAppDeskbarSymlink $appsDir/scummvm ScummVM -} diff --git a/games-engines/scummvm/scummvm-1.7.0.recipe b/games-engines/scummvm/scummvm-1.7.0.recipe deleted file mode 100644 index 7e99154eb..000000000 --- a/games-engines/scummvm/scummvm-1.7.0.recipe +++ /dev/null @@ -1,91 +0,0 @@ -SUMMARY="Script Creation Utility for Maniac Mansion Virtual Machine" -DESCRIPTION="ScummVM is a program which allows you to run certain classic \ -graphical point-and-click adventure games, provided you already have their \ -data files. The clever part about this: ScummVM just replaces the executables \ -shipped with the games, allowing you to play them on systems for which they \ -were never designed!" -HOMEPAGE="http://scummvm.org" -COPYRIGHT="2001-2014 ScummVM Team" -LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="http://sourceforge.net/projects/scummvm/files/scummvm/1.7.0/scummvm-1.7.0.tar.gz" -CHECKSUM_SHA256="aaee99d06b9c55e1359556908b5faeccfa017f2fdf5d1f3cf978dfb02b5bc301" -ADDITIONAL_FILES="scummvm.rdef" - -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - scummvm$secondaryArchSuffix = $portVersion - app:scummvm$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libfaad$secondaryArchSuffix - lib:libFLAC$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libfluidsynth$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libmad$secondaryArchSuffix - lib:libmpeg2$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - lib:libSDL$secondaryArchSuffix - lib:libtheora$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfaad$secondaryArchSuffix - devel:libFLAC$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libfluidsynth$secondaryArchSuffix - devel:libGL$secondaryArchSuffix - devel:libglu$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix - devel:libmad$secondaryArchSuffix - devel:libmpeg2$secondaryArchSuffix - devel:libogg$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - devel:libSDL$secondaryArchSuffix - devel:libtheora$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:git - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:nasm - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - libtoolize --force --copy --install - CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix \ - --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \ - --mandir=$manDir --docdir=$docDir \ - --disable-debug --enable-release #--disable-all-engines - #the default build doesn't build all engines, those that are still under - #construction can be built with --enable-all-engines for testing purposes - #--disable-all-engines can be used to only compile scummvm without - #engines, which makes it build faster - - make $jobArgs -} - -INSTALL() -{ - make install - mv $appsDir/scummvm $appsDir/ScummVM - addResourcesToBinaries $portDir/additional-files/scummvm.rdef \ - $appsDir/ScummVM - - addAppDeskbarSymlink $appsDir/ScummVM ScummVM -} diff --git a/games-engines/scummvm/scummvm-1.8.0.recipe b/games-engines/scummvm/scummvm-1.9.0.recipe similarity index 65% rename from games-engines/scummvm/scummvm-1.8.0.recipe rename to games-engines/scummvm/scummvm-1.9.0.recipe index 58047a6b3..50e728b65 100644 --- a/games-engines/scummvm/scummvm-1.8.0.recipe +++ b/games-engines/scummvm/scummvm-1.9.0.recipe @@ -4,25 +4,25 @@ graphical point-and-click adventure games, provided you already have their \ data files. The clever part about this: ScummVM just replaces the executables \ shipped with the games, allowing you to play them on systems for which they \ were never designed!" -HOMEPAGE="http://scummvm.org" -SOURCE_URI="http://scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.xz" -CHECKSUM_SHA256="a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8" -REVISION="1" -LICENSE="GNU GPL v2" +HOMEPAGE="https://www.scummvm.org/" COPYRIGHT="2001-2014 ScummVM Team" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="http://scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.xz" +CHECKSUM_SHA256="2417edcb1ad51ca05a817c58aeee610bc6db5442984e8cf28e8a5fd914e8ae05" +ADDITIONAL_FILES="scummvm.rdef.in" ARCHITECTURES="!x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" -ADDITIONAL_FILES="scummvm.rdef" - PROVIDES=" scummvm$secondaryArchSuffix = $portVersion app:scummvm$secondaryArchSuffix = $portVersion -" + " REQUIRES=" haiku$secondaryArchSuffix + #lib:libcurl$secondaryArchSuffix #not needed yet lib:libbz2$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libflac$secondaryArchSuffix @@ -36,13 +36,15 @@ REQUIRES=" lib:libogg$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libSDL$secondaryArchSuffix + #lib:libsdl_net$secondaryArchSuffix #not needed yet lib:libtheora$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libz$secondaryArchSuffix -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + #devel:libcurl$secondaryArchSuffix #not needed yet devel:libbz2$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libflac$secondaryArchSuffix @@ -56,32 +58,32 @@ BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libSDL$secondaryArchSuffix + #devel:libsdl_net$secondaryArchSuffix #not needed yet devel:libtheora$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix -" + " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix - cmd:git cmd:ld$secondaryArchSuffix - cmd:libtoolize + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:nasm cmd:pkg_config$secondaryArchSuffix -" + " BUILD() { libtoolize --force --copy --install CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix \ - --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \ - --mandir=$manDir --docdir=$docDir \ - --disable-debug --enable-release #--disable-all-engines - #--disable-all-engines can be used to only compile scummvm without - #engines, which makes it build faster, those that are still under - #construction can be built with --enable-all-engines for testing purposes - + --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \ + --mandir=$manDir --docdir=$docDir \ + --disable-debug --enable-release --disable-eventrecorder \ + #--disable-all-engines #can be used to compile scummvm without \ + #engines, which makes it build faster (to test), those that \ + #are still under construction can be built with --enable-all-engines \ + #for testing purposes make $jobArgs } @@ -89,8 +91,23 @@ INSTALL() { make install mv $appsDir/scummvm $appsDir/ScummVM - addResourcesToBinaries $portDir/additional-files/scummvm.rdef \ + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + $portDir/additional-files/scummvm.rdef.in > scummvm.rdef + + addResourcesToBinaries scummvm.rdef \ $appsDir/ScummVM - addAppDeskbarSymlink $appsDir/ScummVM ScummVM + addAppDeskbarSymlink $appsDir/ScummVM +} + +TEST() +{ + make test }