[vlc-commits] contrib: hopefully fix gme build on mac

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Sat Sep  7 16:03:35 2013 +0400| [5ba5e47281651b28fc6592746a4017376c995fff] | committer: Rafaël Carré

contrib: hopefully fix gme build on mac

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 contrib/src/gme/gme-quotes.patch |   19 +++++++++++++++++++
 contrib/src/gme/rules.mak        |    1 +
 2 files changed, 20 insertions(+)

diff --git a/contrib/src/gme/gme-quotes.patch b/contrib/src/gme/gme-quotes.patch
new file mode 100644
index 0000000..1b3d5a5
--- /dev/null
+++ b/contrib/src/gme/gme-quotes.patch
@@ -0,0 +1,19 @@
+--- game-music-emu/CMakeLists.txt       2013-03-17 03:13:46.000000000 +0100
++++ game-music-emu.patched/CMakeLists.txt       2013-09-07 13:53:36.000000000 +0200
+@@ -67,14 +67,14 @@
+       string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+
+       # gcc <4.1 had poor support for symbol visibility
+-      if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
++      if (("${_gcc_version}" VERSION_GREATER "4.1") OR ("${_gcc_version}" VERSION_EQUAL "4.1"))
+          set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+          set (ENABLE_VISIBILITY ON)
+          add_definitions (-DLIBGME_VISIBILITY)
+
+          # GCC >= 4.2 also correctly supports making inline members have hidden
+          # visibility by default.
+-         if ((${_gcc_version} VERSION_GREATER "4.2") OR (${_gcc_version} VERSION_EQUAL "4.2"))
++         if (("${_gcc_version}" VERSION_GREATER "4.2") OR ("${_gcc_version}" VERSION_EQUAL "4.2"))
+             set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+          endif()
+       endif()
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index 6adefee..f051781 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -13,6 +13,7 @@ $(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
 	$(MOVE)
 
 .gme: game-music-emu toolchain.cmake