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.4.recipe
similarity index 81%
rename from media-libs/game-music-emu/game_music_emu-0.6.3.recipe
rename to media-libs/game-music-emu/game_music_emu-0.6.4.recipe
index a43ff1b17..55a3f0fc7 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.4.recipe
@@ -15,9 +15,9 @@ HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu"
 COPYRIGHT="2002 Stephane Dallongeville
 	2003-2009 Shay Green"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.xz"
-CHECKSUM_SHA256="aba34e53ef0ec6a34b58b84e28bf8cfbccee6585cebca25333604c35db3e051d"
+REVISION="1"
+SOURCE_URI="https://github.com/libgme/game-music-emu/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="f2360feb5a32ace226c583df4faf6eff74145c81264aaea11e17a1af2f6f101a"
 SOURCE_DIR="game-music-emu-$portVersion"
 PATCHES="game_music_emu-$portVersion.patchset"
 
@@ -55,16 +55,13 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-defineDebugInfoPackage game_music_emu$secondaryArchSuffix \
-	$libDir/libgme.so.$portVersion
-
 BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
-		-DLIB_SUFFIX=/${secondaryArchSuffix#"_"} \
-		-DENABLE_UBSAN=OFF -L
+		$cmakeDirArgs \
+		-DENABLE_UBSAN=OFF \
+		-DGME_BUILD_STATIC=OFF
+
 	make -C build $jobArgs
 }
 
@@ -83,3 +80,8 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	ctest --test-dir build --output-on-failure
+}
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
deleted file mode 100644
index ea3a7a216..000000000
--- a/media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset
+++ /dev/null
@@ -1,142 +0,0 @@
-From 937d8de67015e0eeccce62f0ece12df26ce7315c Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-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 580f395..df0e70a 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 290f57f..048f6ef 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 3aafa5e..0f0c7b9 100644
---- a/gme/Music_Emu.h
-+++ b/gme/Music_Emu.h
-@@ -78,7 +78,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 e538b1b..55461b0 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 fd65f0a..5c015c1 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 76e1ac6..c7d06b1 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 40cfb71..9d21c6a 100644
---- a/gme/Vgm_Emu.h
-+++ b/gme/Vgm_Emu.h
-@@ -53,7 +53,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.37.3
-
-
-From 2edc7bde4725b841a1c5b6c924a6482caeef7369 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-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
-