[vlc-commits] contrib: really compile taglib statically

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul  4 23:29:58 2011 +0300| [90d18ede76c59c362ce975866d1f44479206ec35] | committer: Rémi Denis-Courmont

contrib: really compile taglib statically

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

 contrib/src/taglib/taglib-static.patch |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/contrib/src/taglib/taglib-static.patch b/contrib/src/taglib/taglib-static.patch
index f7a8887..eafeec8 100644
--- a/contrib/src/taglib/taglib-static.patch
+++ b/contrib/src/taglib/taglib-static.patch
@@ -13,3 +13,19 @@ diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h
  #endif
  #elif defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 1)
  #define TAGLIB_EXPORT __attribute__ ((visibility("default")))
+diff -ru taglib.orig/bindings/c/CMakeLists.txt taglib/bindings/c/CMakeLists.txt
+--- taglib.orig/bindings/c/CMakeLists.txt	2011-07-04 23:25:15.000000000 +0300
++++ taglib/bindings/c/CMakeLists.txt	2011-07-04 23:27:43.000000000 +0300
+@@ -19,9 +19,11 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc )
+ ########### next target ###############
+ 
+-ADD_LIBRARY(tag_c SHARED tag_c.cpp)
+ if(ENABLE_STATIC)
++    add_LIBRARY(tag_c STATIC tag_c.cpp)
+     set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
++else(ENABLE_STATIC)
++    add_LIBRARY(tag_c SHARED tag_c.cpp)
+ endif(ENABLE_STATIC)
+ 
+ TARGET_LINK_LIBRARIES(tag_c  tag )