[vlc-commits] commit: Contribs: add GME target and patch it for static ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Nov  1 14:50:35 2010 +0100| [3133dd3015071cc8757e04c81e631684b02a5388] | committer: Jean-Baptiste Kempf 

Contribs: add GME target and patch it for static

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

 extras/contrib/src/Patches/gme-static.patch |   19 +++++++++++++++++++
 extras/contrib/src/contrib-src.mak          |   18 ++++++++++++++++++
 extras/contrib/src/packages.mak             |    4 +++-
 3 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Patches/gme-static.patch b/extras/contrib/src/Patches/gme-static.patch
new file mode 100644
index 0000000..38562a0
--- /dev/null
+++ b/extras/contrib/src/Patches/gme-static.patch
@@ -0,0 +1,19 @@
+--- game-music-emu-0.5.5/gme/CMakeLists.txt	2009-07-13 06:53:08.000000000 +0200
++++ game-music-emu-0.5.5.new/gme/CMakeLists.txt	2010-11-01 14:39:13.570651361 +0100
+@@ -148,7 +148,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 changes/additions to API) the
+@@ -158,6 +158,6 @@
+                SOVERSION 0)
+ 
+ # TODO: Libsuffix for 64-bit?
+-install(TARGETS gme LIBRARY DESTINATION lib)
++install(TARGETS gme ARCHIVE DESTINATION lib)
+ 
+ install(FILES ${EXPORTED_HEADERS} DESTINATION include/gme)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 82abe19..50b21b0 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2576,6 +2576,24 @@ CLEAN_FILE += .sqlite3
 CLEAN_PKG += sqlite-$(SQLITE_VERSION)
 DISTCLEAN_PKG += sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 
+# *****************************
+# GME
+# *****************************
+game-music-emu-$(GME_VERSION).tbz2:
+	$(WGET) $(GME_URL)
+
+game-music-emu-$(GME_VERSION): game-music-emu-$(GME_VERSION).tbz2
+	$(EXTRACT_BZ2)
+	patch -p0 < Patches/gme-static.patch
+
+.gme: game-music-emu-$(GME_VERSION)
+	(cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make && make install )
+	touch $@
+
+CLEAN_FILE += .gme
+CLEAN_PKG  += game-music-emu-$(GME_VERSION)
+DISTCLEAN_PKG += game-music-emu-$(GME_VERSION).tbz2
+
 # ***************************************************************************
 # Make sure the build tools are built before the other targets
 # ***************************************************************************
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 8d308e2..81ba4cc 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -235,5 +235,7 @@ SQLITE_VERSION=3.6.20
 SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h
 D2D_URL=http://nodeload.github.com/2of1/d2d1headers/tarball/master
-VPX_VERSION=0.9.0
+VPX_VERSION=0.9.2
 VPX_URL=http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
+GME_VERSION=0.5.5
+GME_URL=http://game-music-emu.googlecode.com/files/game-music-emu-$(GME_VERSION).tbz2