Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
47fbc1bb
Commit
47fbc1bb
authored
Jul 04, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update GME to 0.6.0
parent
e7273e3a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
27 deletions
+7
-27
contrib/src/gme/SHA512SUMS
contrib/src/gme/SHA512SUMS
+1
-1
contrib/src/gme/android.patch
contrib/src/gme/android.patch
+0
-11
contrib/src/gme/gme-static.patch
contrib/src/gme/gme-static.patch
+4
-12
contrib/src/gme/rules.mak
contrib/src/gme/rules.mak
+2
-3
No files found.
contrib/src/gme/SHA512SUMS
View file @
47fbc1bb
dcf341bf0ab8237a98bceef3b0bc8e8bd11851179f989c561878ff421912158bfdbae4bf613ecc9f6a569b02dce4fbd41acf68a3c9c5ea137938bd5cdc353ff4 game-music-emu-0.5.5
.tar.bz2
9bd914cc89279519456a37a71c66cec12f7bea64f286fd118680b83eba76ebe547bb0774ad91230a53d004f5cd1a41ad399ffb94e15dd9fc3460abe6732ab4dd game-music-emu-0.6.0
.tar.bz2
contrib/src/gme/android.patch
deleted
100644 → 0
View file @
e7273e3a
--- 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
contrib/src/gme/gme-static.patch
View file @
47fbc1bb
--- 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 +01
00
@@ -14
8,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 +02
00
@@ -14
3,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
contrib/src/gme/rules.mak
View file @
47fbc1bb
# 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)
.t
ar.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment