[vlc-commits] Contribs: update GME to 0.6.1

[Alexandre Fernandez]

vlc | branch: master | Alexandre Fernandez <nerf at boboop.fr> | Fri Nov 10 13:29:18 2017 +0100| [ed872beb60d1f54d13341b0bd349b81cc50a40ca] | committer: Jean-Baptiste Kempf

Contribs: update GME to 0.6.1

This minor version patches some security vulnerabilities

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ed872beb60d1f54d13341b0bd349b81cc50a40ca
---

 contrib/src/gme/SHA512SUMS       |  2 +-
 contrib/src/gme/gme-static.patch | 11 -----------
 contrib/src/gme/rules.mak        |  5 ++---
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/contrib/src/gme/SHA512SUMS b/contrib/src/gme/SHA512SUMS
index 836273e794..fbff00c0e5 100644
--- a/contrib/src/gme/SHA512SUMS
+++ b/contrib/src/gme/SHA512SUMS
@@ -1 +1 @@
-9bd914cc89279519456a37a71c66cec12f7bea64f286fd118680b83eba76ebe547bb0774ad91230a53d004f5cd1a41ad399ffb94e15dd9fc3460abe6732ab4dd  game-music-emu-0.6.0.tar.bz2
+06b3544086fae51361706b0417ae1bc3769863c7d060ebabdd09b930d37df973314c43afff32aedaa9ebb74cdeafdeadaac4aa5d448700ee961d79d7fc9012b4  game-music-emu-0.6.1.tar.bz2
diff --git a/contrib/src/gme/gme-static.patch b/contrib/src/gme/gme-static.patch
deleted file mode 100644
index f1bed229d0..0000000000
--- a/contrib/src/gme/gme-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- game-music-emu-0.6.0/gme/CMakeLists.txt.orig	2012-05-27 22:48:53.000000000 +0200
-+++ game-music-emu-0.6.0/gme/CMakeLists.txt	2013-07-04 19:48:23.031372405 +0200
-@@ -143,7 +143,7 @@
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- # Add library to be compiled.
--add_library(gme SHARED ${libgme_SRCS})
-+add_library(gme STATIC ${libgme_SRCS})
- 
- # The version is the release.  The "soversion" is the API version.  As long
- # as only build fixes are performed (i.e. no backwards-incompatible changes
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index bc85a99f67..de66fe9e6c 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -1,6 +1,6 @@
 # Game Music Emu
 
-GME_VERSION := 0.6.0
+GME_VERSION := 0.6.1
 GME_URL := https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$(GME_VERSION).tar.bz2
 
 PKGS += gme
@@ -12,12 +12,11 @@ $(TARBALLS)/game-music-emu-$(GME_VERSION).tar.bz2:
 
 game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
 	$(UNPACK)
-	$(APPLY) $(SRC)/gme/gme-static.patch
 	$(APPLY) $(SRC)/gme/gme-quotes.patch
 	$(APPLY) $(SRC)/gme/skip-underrun.patch
 	$(MOVE)
 
 .gme: game-music-emu toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) .
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) -DBUILD_SHARED_LIBS=OFF .
 	cd $< && $(MAKE) install
 	touch $@