From dd41a3d84472d16c4ffd9f0630832e714fb75a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 2 Dec 2013 18:32:33 +0000 Subject: [PATCH 1/8] ScummVM 1.6.0 --- games-engines/scummvm/scummvm-1.6.0.recipe | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 games-engines/scummvm/scummvm-1.6.0.recipe diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe new file mode 100644 index 000000000..f7d06705f --- /dev/null +++ b/games-engines/scummvm/scummvm-1.6.0.recipe @@ -0,0 +1,56 @@ +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" +SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download" +CHECKSUM_MD5="473c151ff44e3db7b603ecacd800a0d2" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2013 ScummVM Team" + +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_64" + +PROVIDES=" + scummvm = $portVersion + app:scummvm = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libSDL$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libSDL$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libglu$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:make$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:nasm$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix +" + +SOURCE_DIR="scummvm-1.6.0" + +BUILD() +{ + libtoolize --force --copy --install + ./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir --mandir=$manDir --docdir=$docDir \ + --enable-release + make +} +INSTALL() +{ + make install + + addAppDeskbarSymlink $appsDir/scummvm +} From 717012b463364e484427cc096ab35c0f1234fff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 2 Dec 2013 18:33:50 +0000 Subject: [PATCH 2/8] Removed old patches --- .../scummvm/patches/scummvm_haiku.diff | 111 ------------------ 1 file changed, 111 deletions(-) delete mode 100644 games-engines/scummvm/patches/scummvm_haiku.diff diff --git a/games-engines/scummvm/patches/scummvm_haiku.diff b/games-engines/scummvm/patches/scummvm_haiku.diff deleted file mode 100644 index 9f2d49e78..000000000 --- a/games-engines/scummvm/patches/scummvm_haiku.diff +++ /dev/null @@ -1,111 +0,0 @@ -Index: configure -=================================================================== ---- configure (revision 35712) -+++ configure (working copy) - -1052,11 +1052,23 @@ - beos*) - DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE" - # Needs -lbind -lsocket for the timidity MIDI driver -+ LDFLAGS="-L/boot/home/config/lib" -+ CFLAGS="-I/boot/home/config/include" -+ CXXFLAGS="$CXXFLAGS -fhuge-objects" - LIBS="$LIBS -lbind -lsocket" - type_1_byte='char' - type_2_byte='short' - type_4_byte='long' - ;; -+ haiku*) -+ DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE" -+ # Needs -lnetwork for the timidity MIDI driver -+ LIBS="$LIBS -lnetwork" -+ CXXFLAGS="$CXXFLAGS -fhuge-objects" -+ type_1_byte='char' -+ type_2_byte='short' -+ type_4_byte='long' -+ ;; - solaris*) - DEFINES="$DEFINES -DUNIX -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE" - # Needs -lbind -lsocket for the timidity MIDI driver -Index: gui/ThemeData.h -=================================================================== ---- gui/ThemeData.h (revision 35712) -+++ gui/ThemeData.h (working copy) - -27,6 +27,7 @@ - #define GUI_THEME_DATA_H - - #include "gui/ThemeEngine.h" -+#include "graphics/VectorRenderer.h" - - namespace GUI { - -Index: config.guess -=================================================================== ---- config.guess (revision 35712) -+++ config.guess (working copy) - -1206,6 +1206,9 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # BeOS running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -Index: config.sub -=================================================================== ---- config.sub (revision 35712) -+++ config.sub (working copy) - -1559,6 +1559,9 @@ - -beos*) - vendor=be - ;; -+ -haiku*) -+ vendor=haiku -+ ;; - -hpux*) - vendor=hp - ;; -Index: graphics/scaler/hq2x_i386.asm -=================================================================== ---- graphics/scaler/hq2x_i386.asm (revision 35712) -+++ graphics/scaler/hq2x_i386.asm (working copy) - -1841,7 +1841,7 @@ - dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 - - --%ifidn __OUTPUT_FORMAT__,elf --section .note.GNU-stack noalloc noexec nowrite progbits --%endif -+# %ifidn __OUTPUT_FORMAT__,elf -+# section .note.GNU-stack noalloc noexec nowrite progbits -+# %endif - -Index: graphics/scaler/hq3x_i386.asm -=================================================================== ---- graphics/scaler/hq3x_i386.asm (revision 35712) -+++ graphics/scaler/hq3x_i386.asm (working copy) - -2433,7 +2433,7 @@ - dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 - - --%ifidn __OUTPUT_FORMAT__,elf --section .note.GNU-stack noalloc noexec nowrite progbits --%endif -+# %ifidn __OUTPUT_FORMAT__,elf -+# section .note.GNU-stack noalloc noexec nowrite progbits -+# %endif - -Index: graphics/surface.h -=================================================================== ---- graphics/surface.h (revision 35712) -+++ graphics/surface.h (working copy) - -47,7 +47,7 @@ - Surface() : w(0), h(0), pitch(0), pixels(0), bytesPerPixel(0) {} - - inline const void *getBasePtr(int x, int y) const { -- return static_cast(pixels) + y * pitch + x * bytesPerPixel; -+ return (const byte *)(pixels) + y * pitch + x * bytesPerPixel; - } - - inline void *getBasePtr(int x, int y) { \ No newline at end of file From 77d595a33f963561407e25ae4483491f2940814f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 2 Dec 2013 20:02:42 +0000 Subject: [PATCH 3/8] Untested on x86_64 --- games-engines/scummvm/scummvm-1.6.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe index f7d06705f..c78dc62b8 100644 --- a/games-engines/scummvm/scummvm-1.6.0.recipe +++ b/games-engines/scummvm/scummvm-1.6.0.recipe @@ -8,8 +8,8 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2001-2013 ScummVM Team" -ARCHITECTURES="x86 x86_64" -SECONDARY_ARCHITECTURES="x86 x86_64" +ARCHITECTURES="x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86 ?x86_64" PROVIDES=" scummvm = $portVersion From 41b76373564a664b8820fce97e7cc96f68dcdd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 2 Dec 2013 20:10:47 +0000 Subject: [PATCH 4/8] Removed secondaryArchSuffix on some Command Line programs --- games-engines/scummvm/scummvm-1.6.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe index c78dc62b8..5f4acd66d 100644 --- a/games-engines/scummvm/scummvm-1.6.0.recipe +++ b/games-engines/scummvm/scummvm-1.6.0.recipe @@ -32,11 +32,11 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:make$secondaryArchSuffix + cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:nasm$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix + cmd:libtoolize " SOURCE_DIR="scummvm-1.6.0" From 4747767f615e1a0c0eccad97d30157c4956cf772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 4 Dec 2013 00:39:11 +0000 Subject: [PATCH 5/8] APlayer for SVN --- haiku-apps/aplayer/aplayer-4.0_svn.recipe | 56 +++++ haiku-apps/aplayer/patches/aplayer.patch | 268 +++++++++++++++++++++ haiku-apps/aplayer/patches/aplayer_2.patch | 34 +++ haiku-apps/aplayer/patches/libgme.patch | 230 ++++++++++++++++++ 4 files changed, 588 insertions(+) create mode 100644 haiku-apps/aplayer/aplayer-4.0_svn.recipe create mode 100644 haiku-apps/aplayer/patches/aplayer.patch create mode 100644 haiku-apps/aplayer/patches/aplayer_2.patch create mode 100644 haiku-apps/aplayer/patches/libgme.patch diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe new file mode 100644 index 000000000..2ecea4464 --- /dev/null +++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe @@ -0,0 +1,56 @@ +SUMMARY="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere." +DESCRIPTION="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere." +HOMEPAGE="http://pulkomandy.tk/projects/APlayer" +SRC_URI="svn://pulkomandy.tk/APlayer/trunk" +REVISION="1" +LICENSE="Artistic" +COPYRIGHT="1994-2002 Polycode 2011-2012 Adrien Destugues" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + aplayer$secondaryArchSuffix = $portVersion + app:aplayer$secondaryArchSuffix = $portVersion + lib:PolyKit = $portVersion + lib:APlayerKit = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion +" +BUILD_PREREQUIRES=" + cmd:g++$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:nasm$secondaryArchSuffix +" +SOURCE_DIR="trunk" + +PATCHES=" + aplayer.patch + aplayer_2.patch +" +BUILD() +{ + cd Master + make + cd .. +} + +INSTALL() +{ + mkdir -p $appsDir + mkdir -p $libDir + mkdir -p $addOnsDir + + cp APlayer/bin/BeOS_/APlayer $appsDir/APlayer + cp APlayer/bin/BeOS_/lib/APlayerKit.so $libDir + cp -r APlayer/bin/BeOS_/add-ons/* $addOnsDir + cp PolyKit/bin/BeOS/PolyKit.so $libDir + addAppDeskbarSymlink $appsDir/APlayer +} diff --git a/haiku-apps/aplayer/patches/aplayer.patch b/haiku-apps/aplayer/patches/aplayer.patch new file mode 100644 index 000000000..6e13e6c8c --- /dev/null +++ b/haiku-apps/aplayer/patches/aplayer.patch @@ -0,0 +1,268 @@ +diff --git a/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp b/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp +index 05a0b99..c35c22f 100644 +--- a/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp ++++ b/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp +@@ -18,10 +18,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + #include "blargg_source.h" + +-Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = +- Music_Emu::make_equalizer( -47.0, 2000 ); +-Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = +- Music_Emu::make_equalizer( 0.0, 300 ); ++Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq ( -47.0, 2000 ); ++Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq ( 0.0, 300 ); + + Gbs_Emu::Gbs_Emu() + { +@@ -40,8 +38,8 @@ Gbs_Emu::Gbs_Emu() + set_silence_lookahead( 6 ); + set_max_initial_silence( 21 ); + set_gain( 1.2 ); +- +- set_equalizer( make_equalizer( -1.0, 120 ) ); ++ static equalizer_t const eq ( -1.0, 120 ); ++ set_equalizer( eq ); + } + + Gbs_Emu::~Gbs_Emu() { } +diff --git a/APlayer/Players/GameMusic/libgme/Gbs_Emu.h b/APlayer/Players/GameMusic/libgme/Gbs_Emu.h +index b233a2b..c9054cc 100644 +--- a/APlayer/Players/GameMusic/libgme/Gbs_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Gbs_Emu.h +@@ -41,7 +41,9 @@ public: + + public: + // deprecated +- using Music_Emu::load; ++ #if !defined(__GNUC__) || __GNUC__ > 2 ++ Music_Emu::load; ++ #endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + +diff --git a/APlayer/Players/GameMusic/libgme/Gym_Emu.h b/APlayer/Players/GameMusic/libgme/Gym_Emu.h +index 1e4ed8b..d11440e 100644 +--- a/APlayer/Players/GameMusic/libgme/Gym_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Gym_Emu.h +@@ -34,7 +34,9 @@ public: + + public: + // deprecated +- using Music_Emu::load; ++ #if !defined(__GNUC__) || __GNUC__ > 2 ++ Music_Emu::load; ++ #endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + enum { gym_rate = 60 }; +diff --git a/APlayer/Players/GameMusic/libgme/Music_Emu.cpp b/APlayer/Players/GameMusic/libgme/Music_Emu.cpp +index 942e86e..065e42b 100644 +--- a/APlayer/Players/GameMusic/libgme/Music_Emu.cpp ++++ b/APlayer/Players/GameMusic/libgme/Music_Emu.cpp +@@ -24,8 +24,7 @@ int const silence_threshold = 0x10; + long const fade_block_size = 512; + int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift) + +-Music_Emu::equalizer_t const Music_Emu::tv_eq = +- Music_Emu::make_equalizer( -8.0, 180 ); ++Music_Emu::equalizer_t const Music_Emu::tv_eq ( -8.0, 180 ); + + void Music_Emu::clear_track_vars() + { +@@ -50,6 +49,7 @@ void Music_Emu::unload() + } + + Music_Emu::Music_Emu() ++ : equalizer_(-1.0, 60) + { + effects_buffer = 0; + +@@ -62,8 +62,6 @@ Music_Emu::Music_Emu() + max_initial_silence = 2; + silence_lookahead = 3; + ignore_silence_ = false; +- equalizer_.treble = -1.0; +- equalizer_.bass = 60; + + static const char* const names [] = { + "Voice 1", "Voice 2", "Voice 3", "Voice 4", +diff --git a/APlayer/Players/GameMusic/libgme/Music_Emu.h b/APlayer/Players/GameMusic/libgme/Music_Emu.h +index d98f7ce..0a8bc0a 100644 +--- a/APlayer/Players/GameMusic/libgme/Music_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Music_Emu.h +@@ -64,7 +64,11 @@ public: + void ignore_silence( bool disable = true ); + + // Info for current track +- using Gme_File::track_info; ++ #if (!defined(__GNUC__) || (__GNUC__ > 2)) ++ Gme_File::track_info; ++ #else ++ blargg_err_t track_info( track_info_t* out, int k ) const {return Gme_File::track_info(out,k); } ++ #endif + blargg_err_t track_info( track_info_t* out ) const; + + // Sound customization +@@ -199,7 +203,7 @@ struct Gme_Info_ : Music_Emu + + inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const + { +- return track_info( out, current_track_ ); ++ return Gme_File::track_info( out, current_track_ ); + } + + inline long Music_Emu::sample_rate() const { return sample_rate_; } +diff --git a/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp b/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp +index eab4bfb..0de854a 100644 +--- a/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp ++++ b/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp +@@ -31,10 +31,8 @@ int const fme7_flag = 0x20; + + long const clock_divisor = 12; + +-Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = +- Music_Emu::make_equalizer( -1.0, 80 ); +-Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = +- Music_Emu::make_equalizer( -15.0, 80 ); ++Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq ( -1.0, 80 ); ++Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq ( -15.0, 80 ); + + int Nsf_Emu::pcm_read( void* emu, nes_addr_t addr ) + { +diff --git a/APlayer/Players/GameMusic/libgme/Nsf_Emu.h b/APlayer/Players/GameMusic/libgme/Nsf_Emu.h +index 0b00168..08b987a 100644 +--- a/APlayer/Players/GameMusic/libgme/Nsf_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Nsf_Emu.h +@@ -44,7 +44,11 @@ public: + + public: + // deprecated +- using Music_Emu::load; ++ #if (!defined(__GNUC__) || (__GNUC__ > 2)) ++ Music_Emu::load; ++ #else ++ blargg_err_t load( Data_Reader& r) {return Music_Emu::load(r);} ++ #endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + +diff --git a/APlayer/Players/GameMusic/libgme/Spc_Emu.h b/APlayer/Players/GameMusic/libgme/Spc_Emu.h +index 09063f1..5f08719 100644 +--- a/APlayer/Players/GameMusic/libgme/Spc_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Spc_Emu.h +@@ -48,7 +48,9 @@ public: + + public: + // deprecated +- using Music_Emu::load; ++ #if !defined(__GNUC__) || __GNUC__ > 2 ++ Music_Emu::load; ++ #endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + byte const* trailer() const; // use track_info() +diff --git a/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp b/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp +index 5c6bc7c..bfc42d8 100644 +--- a/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp ++++ b/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp +@@ -35,8 +35,8 @@ Vgm_Emu::Vgm_Emu() + set_voice_types( types ); + + set_silence_lookahead( 1 ); // tracks should already be trimmed +- +- set_equalizer( make_equalizer( -14.0, 80 ) ); ++ static equalizer_t const eq( -14.0, 80 ); ++ set_equalizer( eq); + } + + Vgm_Emu::~Vgm_Emu() { } +diff --git a/APlayer/Players/GameMusic/libgme/Vgm_Emu.h b/APlayer/Players/GameMusic/libgme/Vgm_Emu.h +index 65895af..4a1f778 100644 +--- a/APlayer/Players/GameMusic/libgme/Vgm_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Vgm_Emu.h +@@ -51,7 +51,9 @@ public: + + public: + // deprecated +- using Music_Emu::load; ++ #if (!defined(__GNUC__) || (__GNUC__ > 2)) ++ Music_Emu::load; ++ #endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + byte const* gd3_data( int* size_out = 0 ) const; // use track_info() +diff --git a/APlayer/Players/GameMusic/libgme/gme.cpp b/APlayer/Players/GameMusic/libgme/gme.cpp +index 4770984..98fee50 100644 +--- a/APlayer/Players/GameMusic/libgme/gme.cpp ++++ b/APlayer/Players/GameMusic/libgme/gme.cpp +@@ -359,9 +359,7 @@ BLARGG_EXPORT void gme_set_equalizer ( Music_Emu* me, gme_equalizer_t cons + + BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out ) + { +- gme_equalizer_t e = gme_equalizer_t(); // Default-init all fields to 0.0f +- e.treble = me->equalizer().treble; +- e.bass = me->equalizer().bass; ++ gme_equalizer_t e(me->equalizer().treble, me->equalizer().bass); + *out = e; + } + +diff --git a/APlayer/Players/GameMusic/libgme/gme.h b/APlayer/Players/GameMusic/libgme/gme.h +index 8eb952e..666538e 100644 +--- a/APlayer/Players/GameMusic/libgme/gme.h ++++ b/APlayer/Players/GameMusic/libgme/gme.h +@@ -143,6 +143,8 @@ typedef struct gme_equalizer_t + double bass; /* 1 = full bass, 90 = average, 16000 = almost no bass */ + + double d2,d3,d4,d5,d6,d7,d8,d9; /* reserved */ ++ ++ gme_equalizer_t(double t, double b) {treble = t; bass = b;}; + } gme_equalizer_t; + + /* Get current frequency equalizater parameters */ +diff --git a/Master/Makefile b/Master/Makefile +index 7ac0424..f8ad52f 100644 +--- a/Master/Makefile ++++ b/Master/Makefile +@@ -5,20 +5,20 @@ VERSION := 4.0.1 + #build date is not currently used. + BUILDDATE := $(shell date +%b_%d_%Y) + +-ARCH := $(shell setgcc | cut -d' ' -f3) ++ARCH := $(shell setg++ | cut -d' ' -f3) + OBJDIR := __OBJ_$(ARCH) + DEPDIR := __DEP_$(ARCH) + RULESDIR := __RULES_$(ARCH) + MAKEFILEDIR := makefiles_x86 + +-CC := gcc -c -pipe +-LD := gcc ++CC := g++ -c -pipe ++LD := g++ + + #Dependency generator +-#DEP := gcc -M -DBEOS_BUILD ++#DEP := g++ -M -DBEOS_BUILD + #Ignores system headers. A bit faster, but might give + #small problems if local headers are used with <> insetad of "". +-DEP := gcc -MM -DBEOS_BUILD ++DEP := g++ -MM -DBEOS_BUILD + + BUILD_DEBUG=TRUE + #BUILD_DEBUG=FALSE +diff --git a/Master/makefiles_x86/makefile.APlayer b/Master/makefiles_x86/makefile.APlayer +index 6b93ba8..aa75bb3 100644 +--- a/Master/makefiles_x86/makefile.APlayer ++++ b/Master/makefiles_x86/makefile.APlayer +@@ -20,9 +20,9 @@ $(NAME)_TYPE := APP + $(NAME)_LIBS := $(APLAYER_LIBS) be root + + ifeq ($(findstring gcc2,$(ARCH)),gcc2) +-$(NAME)_LIBS += stdc++.r4 ++$(NAME)_LIBS += stdc++.r4.r4 + else +-$(NAME)_LIBS += stdc++ ++$(NAME)_LIBS += stdc++.r4 + endif + + $(NAME)_RSRCS := $(ROOTDIR)/BeOS/Server_x86.rsrc diff --git a/haiku-apps/aplayer/patches/aplayer_2.patch b/haiku-apps/aplayer/patches/aplayer_2.patch new file mode 100644 index 000000000..6fe4a518c --- /dev/null +++ b/haiku-apps/aplayer/patches/aplayer_2.patch @@ -0,0 +1,34 @@ +diff --git a/APlayer/Players/GameMusic/libgme/Music_Emu.h b/APlayer/Players/GameMusic/libgme/Music_Emu.h +index 0a8bc0a..fd5dbc1 100644 +--- a/APlayer/Players/GameMusic/libgme/Music_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Music_Emu.h +@@ -107,14 +107,6 @@ public: + + // Set frequency equalizer parameters + void set_equalizer( equalizer_t const& ); +- +- // Construct equalizer of given treble/bass settings +- static const equalizer_t make_equalizer( double treble, double bass ) +- { +- const Music_Emu::equalizer_t e = { treble, bass, +- 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; +- return e; +- } + + // Equalizer settings for TV speaker + static equalizer_t const tv_eq; +diff --git a/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h b/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h +index 32b05d5..880b951 100644 +--- a/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h ++++ b/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h +@@ -46,7 +46,9 @@ public: + public: + // deprecated + struct header_t { char tag [4]; }; +- using Music_Emu::load; ++ #ifdef (!defined(__GNUC__) || (__GNUC__ > 2)) ++ Music_Emu::load; ++ #endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + void disable_playlist( bool = true ); // use clear_playlist() diff --git a/haiku-apps/aplayer/patches/libgme.patch b/haiku-apps/aplayer/patches/libgme.patch new file mode 100644 index 000000000..91ef9cd0c --- /dev/null +++ b/haiku-apps/aplayer/patches/libgme.patch @@ -0,0 +1,230 @@ +Index: gme.cpp +=================================================================== +--- gme.cpp (revision 34) ++++ gme.cpp (working copy) +@@ -357,9 +357,7 @@ + + BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out ) + { +- gme_equalizer_t e = { }; +- e.treble = me->equalizer().treble; +- e.bass = me->equalizer().bass; ++ gme_equalizer_t e(me->equalizer().treble, me->equalizer().bass); + *out = e; + } + +Index: Gbs_Emu.cpp +=================================================================== +--- Gbs_Emu.cpp (revision 34) ++++ Gbs_Emu.cpp (working copy) +@@ -18,8 +18,8 @@ + + #include "blargg_source.h" + +-Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = { -47.0, 2000 }; +-Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = { 0.0, 300 }; ++Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq ( -47.0, 2000 ); ++Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq ( 0.0, 300 ); + + Gbs_Emu::Gbs_Emu() + { +@@ -39,7 +39,7 @@ + set_max_initial_silence( 21 ); + set_gain( 1.2 ); + +- static equalizer_t const eq = { -1.0, 120 }; ++ static equalizer_t const eq ( -1.0, 120 ); + set_equalizer( eq ); + } + +Index: Nsf_Emu.h +=================================================================== +--- Nsf_Emu.h (revision 34) ++++ Nsf_Emu.h (working copy) +@@ -44,7 +44,11 @@ + + public: + // deprecated ++#if (!defined(__GNUC__) || (__GNUC__ > 2)) + Music_Emu::load; ++#else ++ blargg_err_t load( Data_Reader& r) {return Music_Emu::load(r);} ++#endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + +Index: Nsfe_Emu.h +=================================================================== +--- Nsfe_Emu.h (revision 34) ++++ Nsfe_Emu.h (working copy) +@@ -46,7 +46,9 @@ + public: + // deprecated + struct header_t { char tag [4]; }; ++#if (!defined(__GNUC__) || (__GNUC__ > 2)) + Music_Emu::load; ++#endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + void disable_playlist( bool = true ); // use clear_playlist() +Index: Gym_Emu.h +=================================================================== +--- Gym_Emu.h (revision 34) ++++ Gym_Emu.h (working copy) +@@ -34,7 +34,9 @@ + + public: + // deprecated ++#if !defined(__GNUC__) || __GNUC__ > 2 + Music_Emu::load; ++#endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + enum { gym_rate = 60 }; +Index: gme.h +=================================================================== +--- gme.h (revision 34) ++++ gme.h (working copy) +@@ -134,6 +134,8 @@ + double bass; /* 1 = full bass, 90 = average, 16000 = almost no bass */ + + double d2,d3,d4,d5,d6,d7,d8,d9; /* reserved */ ++ ++ gme_equalizer_t(double t, double b) {treble = t; bass = b;}; + } gme_equalizer_t; + + /* Get current frequency equalizater parameters */ +Index: Music_Emu.cpp +=================================================================== +--- Music_Emu.cpp (revision 34) ++++ Music_Emu.cpp (working copy) +@@ -24,7 +24,7 @@ + long const fade_block_size = 512; + int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift) + +-Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180 }; ++Music_Emu::equalizer_t const Music_Emu::tv_eq ( -8.0, 180 ); + + void Music_Emu::clear_track_vars() + { +@@ -49,6 +49,7 @@ + } + + Music_Emu::Music_Emu() ++ : equalizer_(-1.0, 60) + { + effects_buffer = 0; + +@@ -61,8 +62,6 @@ + max_initial_silence = 2; + silence_lookahead = 3; + ignore_silence_ = false; +- equalizer_.treble = -1.0; +- equalizer_.bass = 60; + + static const char* const names [] = { + "Voice 1", "Voice 2", "Voice 3", "Voice 4", +Index: Spc_Emu.h +=================================================================== +--- Spc_Emu.h (revision 34) ++++ Spc_Emu.h (working copy) +@@ -48,7 +48,9 @@ + + public: + // deprecated ++#if !defined(__GNUC__) || __GNUC__ > 2 + Music_Emu::load; ++#endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + byte const* trailer() const; // use track_info() +Index: Music_Emu.h +=================================================================== +--- Music_Emu.h (revision 34) ++++ Music_Emu.h (working copy) +@@ -58,7 +58,11 @@ + void ignore_silence( bool disable = true ); + + // Info for current track ++#if (!defined(__GNUC__) || (__GNUC__ > 2)) + Gme_File::track_info; ++#else ++ blargg_err_t track_info( track_info_t* out, int k ) const {return Gme_File::track_info(out,k); } ++#endif + blargg_err_t track_info( track_info_t* out ) const; + + // Sound customization +@@ -116,7 +120,7 @@ + + virtual blargg_err_t set_sample_rate_( long sample_rate ) = 0; + virtual void set_equalizer_( equalizer_t const& ) { } +- virtual void enable_accuracy_( bool enable ) { } ++ virtual void enable_accuracy_( bool /*enable*/ ) { } + virtual void mute_voices_( int mask ) = 0; + virtual void set_tempo_( double ) = 0; + virtual blargg_err_t start_track_( int ) = 0; // tempo is set before this +@@ -185,7 +189,7 @@ + + inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const + { +- return track_info( out, current_track_ ); ++ return Gme_File::track_info( out, current_track_ ); + } + + inline long Music_Emu::sample_rate() const { return sample_rate_; } +Index: Vgm_Emu.h +=================================================================== +--- Vgm_Emu.h (revision 34) ++++ Vgm_Emu.h (working copy) +@@ -51,7 +51,9 @@ + + public: + // deprecated ++#if (!defined(__GNUC__) || (__GNUC__ > 2)) + Music_Emu::load; ++#endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + byte const* gd3_data( int* size_out = 0 ) const; // use track_info() +Index: Gbs_Emu.h +=================================================================== +--- Gbs_Emu.h (revision 34) ++++ Gbs_Emu.h (working copy) +@@ -41,7 +41,9 @@ + + public: + // deprecated ++#if !defined(__GNUC__) || __GNUC__ > 2 + Music_Emu::load; ++#endif + blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader + { return load_remaining_( &h, sizeof h, in ); } + +Index: Nsf_Emu.cpp +=================================================================== +--- Nsf_Emu.cpp (revision 34) ++++ Nsf_Emu.cpp (working copy) +@@ -31,8 +31,8 @@ + + long const clock_divisor = 12; + +-Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = { -1.0, 80 }; +-Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = { -15.0, 80 }; ++Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq ( -1.0, 80 ); ++Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq ( -15.0, 80 ); + + int Nsf_Emu::pcm_read( void* emu, nes_addr_t addr ) + { +Index: Vgm_Emu.cpp +=================================================================== +--- Vgm_Emu.cpp (revision 34) ++++ Vgm_Emu.cpp (working copy) +@@ -36,7 +36,7 @@ + + set_silence_lookahead( 1 ); // tracks should already be trimmed + +- static equalizer_t const eq = { -14.0, 80 }; ++ static equalizer_t const eq( -14.0, 80 ); + set_equalizer( eq ); + } + From d02756fd15c9964cff5e3ec0fa3bb249d51ebb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 4 Dec 2013 00:39:37 +0000 Subject: [PATCH 6/8] libgme patch unused --- haiku-apps/aplayer/patches/libgme.patch | 230 ------------------------ 1 file changed, 230 deletions(-) delete mode 100644 haiku-apps/aplayer/patches/libgme.patch diff --git a/haiku-apps/aplayer/patches/libgme.patch b/haiku-apps/aplayer/patches/libgme.patch deleted file mode 100644 index 91ef9cd0c..000000000 --- a/haiku-apps/aplayer/patches/libgme.patch +++ /dev/null @@ -1,230 +0,0 @@ -Index: gme.cpp -=================================================================== ---- gme.cpp (revision 34) -+++ gme.cpp (working copy) -@@ -357,9 +357,7 @@ - - BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out ) - { -- gme_equalizer_t e = { }; -- e.treble = me->equalizer().treble; -- e.bass = me->equalizer().bass; -+ gme_equalizer_t e(me->equalizer().treble, me->equalizer().bass); - *out = e; - } - -Index: Gbs_Emu.cpp -=================================================================== ---- Gbs_Emu.cpp (revision 34) -+++ Gbs_Emu.cpp (working copy) -@@ -18,8 +18,8 @@ - - #include "blargg_source.h" - --Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = { -47.0, 2000 }; --Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = { 0.0, 300 }; -+Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq ( -47.0, 2000 ); -+Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq ( 0.0, 300 ); - - Gbs_Emu::Gbs_Emu() - { -@@ -39,7 +39,7 @@ - set_max_initial_silence( 21 ); - set_gain( 1.2 ); - -- static equalizer_t const eq = { -1.0, 120 }; -+ static equalizer_t const eq ( -1.0, 120 ); - set_equalizer( eq ); - } - -Index: Nsf_Emu.h -=================================================================== ---- Nsf_Emu.h (revision 34) -+++ Nsf_Emu.h (working copy) -@@ -44,7 +44,11 @@ - - public: - // deprecated -+#if (!defined(__GNUC__) || (__GNUC__ > 2)) - Music_Emu::load; -+#else -+ blargg_err_t load( Data_Reader& r) {return Music_Emu::load(r);} -+#endif - blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader - { return load_remaining_( &h, sizeof h, in ); } - -Index: Nsfe_Emu.h -=================================================================== ---- Nsfe_Emu.h (revision 34) -+++ Nsfe_Emu.h (working copy) -@@ -46,7 +46,9 @@ - public: - // deprecated - struct header_t { char tag [4]; }; -+#if (!defined(__GNUC__) || (__GNUC__ > 2)) - Music_Emu::load; -+#endif - blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader - { return load_remaining_( &h, sizeof h, in ); } - void disable_playlist( bool = true ); // use clear_playlist() -Index: Gym_Emu.h -=================================================================== ---- Gym_Emu.h (revision 34) -+++ Gym_Emu.h (working copy) -@@ -34,7 +34,9 @@ - - public: - // deprecated -+#if !defined(__GNUC__) || __GNUC__ > 2 - Music_Emu::load; -+#endif - blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader - { return load_remaining_( &h, sizeof h, in ); } - enum { gym_rate = 60 }; -Index: gme.h -=================================================================== ---- gme.h (revision 34) -+++ gme.h (working copy) -@@ -134,6 +134,8 @@ - double bass; /* 1 = full bass, 90 = average, 16000 = almost no bass */ - - double d2,d3,d4,d5,d6,d7,d8,d9; /* reserved */ -+ -+ gme_equalizer_t(double t, double b) {treble = t; bass = b;}; - } gme_equalizer_t; - - /* Get current frequency equalizater parameters */ -Index: Music_Emu.cpp -=================================================================== ---- Music_Emu.cpp (revision 34) -+++ Music_Emu.cpp (working copy) -@@ -24,7 +24,7 @@ - long const fade_block_size = 512; - int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift) - --Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180 }; -+Music_Emu::equalizer_t const Music_Emu::tv_eq ( -8.0, 180 ); - - void Music_Emu::clear_track_vars() - { -@@ -49,6 +49,7 @@ - } - - Music_Emu::Music_Emu() -+ : equalizer_(-1.0, 60) - { - effects_buffer = 0; - -@@ -61,8 +62,6 @@ - max_initial_silence = 2; - silence_lookahead = 3; - ignore_silence_ = false; -- equalizer_.treble = -1.0; -- equalizer_.bass = 60; - - static const char* const names [] = { - "Voice 1", "Voice 2", "Voice 3", "Voice 4", -Index: Spc_Emu.h -=================================================================== ---- Spc_Emu.h (revision 34) -+++ Spc_Emu.h (working copy) -@@ -48,7 +48,9 @@ - - public: - // deprecated -+#if !defined(__GNUC__) || __GNUC__ > 2 - Music_Emu::load; -+#endif - blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader - { return load_remaining_( &h, sizeof h, in ); } - byte const* trailer() const; // use track_info() -Index: Music_Emu.h -=================================================================== ---- Music_Emu.h (revision 34) -+++ Music_Emu.h (working copy) -@@ -58,7 +58,11 @@ - void ignore_silence( bool disable = true ); - - // Info for current track -+#if (!defined(__GNUC__) || (__GNUC__ > 2)) - Gme_File::track_info; -+#else -+ blargg_err_t track_info( track_info_t* out, int k ) const {return Gme_File::track_info(out,k); } -+#endif - blargg_err_t track_info( track_info_t* out ) const; - - // Sound customization -@@ -116,7 +120,7 @@ - - virtual blargg_err_t set_sample_rate_( long sample_rate ) = 0; - virtual void set_equalizer_( equalizer_t const& ) { } -- virtual void enable_accuracy_( bool enable ) { } -+ virtual void enable_accuracy_( bool /*enable*/ ) { } - virtual void mute_voices_( int mask ) = 0; - virtual void set_tempo_( double ) = 0; - virtual blargg_err_t start_track_( int ) = 0; // tempo is set before this -@@ -185,7 +189,7 @@ - - inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const - { -- return track_info( out, current_track_ ); -+ return Gme_File::track_info( out, current_track_ ); - } - - inline long Music_Emu::sample_rate() const { return sample_rate_; } -Index: Vgm_Emu.h -=================================================================== ---- Vgm_Emu.h (revision 34) -+++ Vgm_Emu.h (working copy) -@@ -51,7 +51,9 @@ - - public: - // deprecated -+#if (!defined(__GNUC__) || (__GNUC__ > 2)) - Music_Emu::load; -+#endif - blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader - { return load_remaining_( &h, sizeof h, in ); } - byte const* gd3_data( int* size_out = 0 ) const; // use track_info() -Index: Gbs_Emu.h -=================================================================== ---- Gbs_Emu.h (revision 34) -+++ Gbs_Emu.h (working copy) -@@ -41,7 +41,9 @@ - - public: - // deprecated -+#if !defined(__GNUC__) || __GNUC__ > 2 - Music_Emu::load; -+#endif - blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader - { return load_remaining_( &h, sizeof h, in ); } - -Index: Nsf_Emu.cpp -=================================================================== ---- Nsf_Emu.cpp (revision 34) -+++ Nsf_Emu.cpp (working copy) -@@ -31,8 +31,8 @@ - - long const clock_divisor = 12; - --Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = { -1.0, 80 }; --Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = { -15.0, 80 }; -+Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq ( -1.0, 80 ); -+Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq ( -15.0, 80 ); - - int Nsf_Emu::pcm_read( void* emu, nes_addr_t addr ) - { -Index: Vgm_Emu.cpp -=================================================================== ---- Vgm_Emu.cpp (revision 34) -+++ Vgm_Emu.cpp (working copy) -@@ -36,7 +36,7 @@ - - set_silence_lookahead( 1 ); // tracks should already be trimmed - -- static equalizer_t const eq = { -14.0, 80 }; -+ static equalizer_t const eq( -14.0, 80 ); - set_equalizer( eq ); - } - From 64878dd035ebfa7417252e23e24237ae95891621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 4 Dec 2013 01:41:13 +0000 Subject: [PATCH 7/8] APlayer fixed copyright --- haiku-apps/aplayer/aplayer-4.0_svn.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe index 2ecea4464..d886efaa0 100644 --- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe +++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe @@ -4,13 +4,14 @@ HOMEPAGE="http://pulkomandy.tk/projects/APlayer" SRC_URI="svn://pulkomandy.tk/APlayer/trunk" REVISION="1" LICENSE="Artistic" -COPYRIGHT="1994-2002 Polycode 2011-2012 Adrien Destugues" +COPYRIGHT=" + 1994-2002 Polycode + 2011-2012 Adrien Destugues +" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -DISABLE_SOURCE_PACKAGE=yes - PROVIDES=" aplayer$secondaryArchSuffix = $portVersion app:aplayer$secondaryArchSuffix = $portVersion From d2a63d5cf81189a91197dd2a55955747c641c280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 4 Dec 2013 01:41:36 +0000 Subject: [PATCH 8/8] ScummVM fixed haiku_devel --- games-engines/scummvm/scummvm-1.6.0.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe index 5f4acd66d..35eb39b2b 100644 --- a/games-engines/scummvm/scummvm-1.6.0.recipe +++ b/games-engines/scummvm/scummvm-1.6.0.recipe @@ -31,7 +31,6 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix