diff --git a/media-libs/game-music-emu/game_music_emu-0.6.1.recipe b/media-libs/game-music-emu/game_music_emu-0.6.1.recipe deleted file mode 100644 index 7e8a4f04c..000000000 --- a/media-libs/game-music-emu/game_music_emu-0.6.1.recipe +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY="Collection of video game music file emulators" -DESCRIPTION="Game_Music_Emu is a collection of video game music file emulators that -support the following formats and systems: - -- AY ZX Spectrum/Amstrad CPC -- GBS Nintendo Game Boy -- GYM Sega Genesis/Mega Drive -- HES NEC TurboGrafx-16/PC Engine -- KSS MSX Home Computer/other Z80 systems (doesn't support FM sound) -- NSF/NSFE Nintendo NES/Famicom (with VRC 6, Namco 106, and FME-7 sound) -- SAP Atari systems using POKEY sound chip -- SPC Super Nintendo/Super Famicom -- VGM/VGZ Sega Master System/Mark III, Sega Genesis/Mega Drive,BBC Micro" -HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu" -COPYRIGHT="2002 Stephane Dallongeville - 2003-2009 Shay Green" -LICENSE="GNU LGPL v2.1" -REVISION="4" -SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.bz2" -CHECKSUM_SHA256="dc11bea098072d540d4d52dfb252e76fc3d3af67ee2807da48fbd8dbda3fd321" -SOURCE_DIR="game-music-emu-$portVersion" -PATCHES="game_music_emu-$portVersion.patchset" - -ARCHITECTURES="all ?x86" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - game_music_emu$secondaryArchSuffix = $portVersion - lib:libgme$secondaryArchSuffix = 0.6.1 compat >= 0 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - game_music_emu${secondaryArchSuffix}_devel = $portVersion - devel:libgme$secondaryArchSuffix = 0.6.1 compat >= 0 - " -REQUIRES_devel=" - game_music_emu$secondaryArchSuffix == $portVersion base - haiku${secondaryArchSuffix}_devel - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:make - " - -defineDebugInfoPackage game_music_emu$secondaryArchSuffix \ - $libDir/libgme.so.0.6.1 - -BUILD() -{ - mkdir -p build - cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX=$prefix \ - -DLIB_SUFFIX=/${secondaryArchSuffix#"_"} - - make $jobArgs -} - -INSTALL() -{ - cd build - make install - - # Fixup install paths - mkdir -p $developDir $includeDir - mv $prefix/include/* $includeDir - rm -rf $prefix/include - - prepareInstalledDevelLib libgme - fixPkgconfig - - packageEntries devel \ - $developDir -} - diff --git a/media-libs/game-music-emu/game_music_emu-0.6.3.recipe b/media-libs/game-music-emu/game_music_emu-0.6.3.recipe index 14833ac43..a43ff1b17 100644 --- a/media-libs/game-music-emu/game_music_emu-0.6.3.recipe +++ b/media-libs/game-music-emu/game_music_emu-0.6.3.recipe @@ -15,13 +15,13 @@ HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu" COPYRIGHT="2002 Stephane Dallongeville 2003-2009 Shay Green" LICENSE="GNU LGPL v2.1" -REVISION="1" +REVISION="2" SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.xz" CHECKSUM_SHA256="aba34e53ef0ec6a34b58b84e28bf8cfbccee6585cebca25333604c35db3e051d" SOURCE_DIR="game-music-emu-$portVersion" PATCHES="game_music_emu-$portVersion.patchset" -ARCHITECTURES="all !x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" libVersionCompat="$portVersion compat >= ${portVersion%.*.*}" @@ -60,26 +60,18 @@ defineDebugInfoPackage game_music_emu$secondaryArchSuffix \ BUILD() { - mkdir -p build - cd build - - cmake .. \ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$prefix \ + -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ -DLIB_SUFFIX=/${secondaryArchSuffix#"_"} \ - -DENABLE_UBSAN=OFF - - make $jobArgs + -DENABLE_UBSAN=OFF -L + make -C build $jobArgs } INSTALL() { make -C build install - # Fixup install paths - mkdir -p $developDir $includeDir - mv $prefix/include/* $includeDir - rm -rf $prefix/include - # copy develop documentation mkdir -p $developDocDir cp -rd $sourceDir/{design,gme,readme}.txt $developDocDir diff --git a/media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset b/media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset deleted file mode 100644 index 1e13c0a4e..000000000 --- a/media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset +++ /dev/null @@ -1,121 +0,0 @@ -From b7fbbe655bd255a8af2195e6bb1a2cd47c75c6d8 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 28 Mar 2016 10:51:20 +0200 -Subject: gcc2 compatibility. - - -diff --git a/gme/Gbs_Emu.h b/gme/Gbs_Emu.h -index b233a2b..a256484 100644 ---- a/gme/Gbs_Emu.h -+++ b/gme/Gbs_Emu.h -@@ -41,7 +41,11 @@ public: - - public: - // deprecated -+#if __GNUC__ <= 2 -+ blargg_err_t load(Data_Reader& in) {return Music_Emu::load(in);} -+#else - using 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/gme/Gym_Emu.h b/gme/Gym_Emu.h -index 1e4ed8b..5ec12f0 100644 ---- a/gme/Gym_Emu.h -+++ b/gme/Gym_Emu.h -@@ -34,7 +34,11 @@ public: - - public: - // deprecated -+#if __GNUC__ <= 2 -+ blargg_err_t load(Data_Reader& in) {return Music_Emu::load(in);} -+#else - using 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/gme/Music_Emu.h b/gme/Music_Emu.h -index b96f4b6..b21a83a 100644 ---- a/gme/Music_Emu.h -+++ b/gme/Music_Emu.h -@@ -58,7 +58,11 @@ public: - void ignore_silence( bool disable = true ); - - // Info for current track -+#if __GNUC__ <= 2 -+ blargg_err_t track_info( track_info_t* out, int t ) const {return Gme_File::track_info(out,t);} -+#else - using Gme_File::track_info; -+#endif - blargg_err_t track_info( track_info_t* out ) const; - - // Sound customization -diff --git a/gme/Nsf_Emu.h b/gme/Nsf_Emu.h -index 0b00168..1617217 100644 ---- a/gme/Nsf_Emu.h -+++ b/gme/Nsf_Emu.h -@@ -44,7 +44,11 @@ public: - - public: - // deprecated -+#if __GNUC__ <= 2 -+ blargg_err_t load(Data_Reader& in) {return Music_Emu::load(in);} -+#else - using 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/gme/Nsfe_Emu.h b/gme/Nsfe_Emu.h -index 32b05d5..ea1e975 100644 ---- a/gme/Nsfe_Emu.h -+++ b/gme/Nsfe_Emu.h -@@ -46,7 +46,11 @@ public: - public: - // deprecated - struct header_t { char tag [4]; }; -+#if __GNUC__ <= 2 -+ blargg_err_t load(Data_Reader& in) {return Music_Emu::load(in);} -+#else - using 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/gme/Spc_Emu.h b/gme/Spc_Emu.h -index 09063f1..d5391e3 100644 ---- a/gme/Spc_Emu.h -+++ b/gme/Spc_Emu.h -@@ -48,7 +48,11 @@ public: - - public: - // deprecated -+#if __GNUC__ <= 2 -+ blargg_err_t load(Data_Reader& in) {return Music_Emu::load(in);} -+#else - using 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/gme/Vgm_Emu.h b/gme/Vgm_Emu.h -index 65895af..d2d0e02 100644 ---- a/gme/Vgm_Emu.h -+++ b/gme/Vgm_Emu.h -@@ -51,7 +51,11 @@ public: - - public: - // deprecated -+#if __GNUC__ <= 2 -+ blargg_err_t load(Data_Reader& in) {return Music_Emu::load(in);} -+#else - using 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() --- -2.7.0 - diff --git a/media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset b/media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset index 1e13c0a4e..ea3a7a216 100644 --- a/media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset +++ b/media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset @@ -1,11 +1,11 @@ -From b7fbbe655bd255a8af2195e6bb1a2cd47c75c6d8 Mon Sep 17 00:00:00 2001 +From 937d8de67015e0eeccce62f0ece12df26ce7315c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 28 Mar 2016 10:51:20 +0200 Subject: gcc2 compatibility. diff --git a/gme/Gbs_Emu.h b/gme/Gbs_Emu.h -index b233a2b..a256484 100644 +index 580f395..df0e70a 100644 --- a/gme/Gbs_Emu.h +++ b/gme/Gbs_Emu.h @@ -41,7 +41,11 @@ public: @@ -21,7 +21,7 @@ index b233a2b..a256484 100644 { return load_remaining_( &h, sizeof h, in ); } diff --git a/gme/Gym_Emu.h b/gme/Gym_Emu.h -index 1e4ed8b..5ec12f0 100644 +index 290f57f..048f6ef 100644 --- a/gme/Gym_Emu.h +++ b/gme/Gym_Emu.h @@ -34,7 +34,11 @@ public: @@ -37,10 +37,10 @@ index 1e4ed8b..5ec12f0 100644 { return load_remaining_( &h, sizeof h, in ); } enum { gym_rate = 60 }; diff --git a/gme/Music_Emu.h b/gme/Music_Emu.h -index b96f4b6..b21a83a 100644 +index 3aafa5e..0f0c7b9 100644 --- a/gme/Music_Emu.h +++ b/gme/Music_Emu.h -@@ -58,7 +58,11 @@ public: +@@ -78,7 +78,11 @@ public: void ignore_silence( bool disable = true ); // Info for current track @@ -53,7 +53,7 @@ index b96f4b6..b21a83a 100644 // Sound customization diff --git a/gme/Nsf_Emu.h b/gme/Nsf_Emu.h -index 0b00168..1617217 100644 +index e538b1b..55461b0 100644 --- a/gme/Nsf_Emu.h +++ b/gme/Nsf_Emu.h @@ -44,7 +44,11 @@ public: @@ -69,7 +69,7 @@ index 0b00168..1617217 100644 { return load_remaining_( &h, sizeof h, in ); } diff --git a/gme/Nsfe_Emu.h b/gme/Nsfe_Emu.h -index 32b05d5..ea1e975 100644 +index fd65f0a..5c015c1 100644 --- a/gme/Nsfe_Emu.h +++ b/gme/Nsfe_Emu.h @@ -46,7 +46,11 @@ public: @@ -85,7 +85,7 @@ index 32b05d5..ea1e975 100644 { return load_remaining_( &h, sizeof h, in ); } void disable_playlist( bool = true ); // use clear_playlist() diff --git a/gme/Spc_Emu.h b/gme/Spc_Emu.h -index 09063f1..d5391e3 100644 +index 76e1ac6..c7d06b1 100644 --- a/gme/Spc_Emu.h +++ b/gme/Spc_Emu.h @@ -48,7 +48,11 @@ public: @@ -101,10 +101,10 @@ index 09063f1..d5391e3 100644 { return load_remaining_( &h, sizeof h, in ); } byte const* trailer() const; // use track_info() diff --git a/gme/Vgm_Emu.h b/gme/Vgm_Emu.h -index 65895af..d2d0e02 100644 +index 40cfb71..9d21c6a 100644 --- a/gme/Vgm_Emu.h +++ b/gme/Vgm_Emu.h -@@ -51,7 +51,11 @@ public: +@@ -53,7 +53,11 @@ public: public: // deprecated @@ -117,5 +117,26 @@ index 65895af..d2d0e02 100644 { return load_remaining_( &h, sizeof h, in ); } byte const* gd3_data( int* size_out = 0 ) const; // use track_info() -- -2.7.0 +2.37.3 + + +From 2edc7bde4725b841a1c5b6c924a6482caeef7369 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Wed, 5 Apr 2023 09:07:11 +0200 +Subject: Fix install path for the headers + + +diff --git a/gme/CMakeLists.txt b/gme/CMakeLists.txt +index b1b2bf0..5966870 100644 +--- a/gme/CMakeLists.txt ++++ b/gme/CMakeLists.txt +@@ -217,5 +217,5 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gme_types.h.in + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libgme.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc @ONLY) + +-install(FILES ${EXPORTED_HEADERS} DESTINATION include/gme) ++install(FILES ${EXPORTED_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gme) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) +-- +2.37.3