mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2025-01-22 15:47:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Contribs: update GME to 0.6.0

Browse Source
This commit is contained in:
Jean-Baptiste Kempf 2013-07-04 19:52:20 +02:00
parent e7273e3a78
commit 47fbc1bb83
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/gme/SHA512SUMS
View File

@ -1 +1 @@
dcf341bf0ab8237a98bceef3b0bc8e8bd11851179f989c561878ff421912158bfdbae4bf613ecc9f6a569b02dce4fbd41acf68a3c9c5ea137938bd5cdc353ff4 game-music-emu-0.5.5.tar.bz2
9bd914cc89279519456a37a71c66cec12f7bea64f286fd118680b83eba76ebe547bb0774ad91230a53d004f5cd1a41ad399ffb94e15dd9fc3460abe6732ab4dd game-music-emu-0.6.0.tar.bz2

11
contrib/src/gme/android.patch
View File

@ -1,11 +0,0 @@
--- game-music-emu/gme/Blip_Buffer.h.orig 2011-12-25 22:27:15.546377001 -0500
+++ game-music-emu/gme/Blip_Buffer.h 2011-12-25 22:27:37.146377002 -0500
@@ -268,7 +268,7 @@
};
#if defined (__GNUC__) || _MSC_VER >= 1100
- #define BLIP_RESTRICT __restrict
+ #define BLIP_RESTRICT __restrict__
#else
#define BLIP_RESTRICT
#endif

16
contrib/src/gme/gme-static.patch
View File

@ -1,6 +1,6 @@
--- 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 @@
--- 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.
@ -8,12 +8,4 @@
+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)
# as only build fixes are performed (i.e. no backwards-incompatible changes

5
contrib/src/gme/rules.mak
View File

@ -1,7 +1,7 @@
# Game Music Emu
GME_VERSION := 0.5.5
GME_URL := http://game-music-emu.googlecode.com/files/game-music-emu-$(GME_VERSION).tbz2
GME_VERSION := 0.6.0
GME_URL := http://game-music-emu.googlecode.com/files/game-music-emu-$(GME_VERSION).tar.bz2
PKGS += gme
@ -13,7 +13,6 @@ $(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/android.patch
$(MOVE)
.gme: game-music-emu toolchain.cmake