[vlc-commits] Old contribs: don' t try to build a shared library when static build is specified

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sat Aug 13 21:05:45 2011 -0400| [e63def641861e599d238f2e8eddb5d582392a86e] | committer: Rafaël Carré

Old contribs: don't try to build a shared library when static build is specified

This applies to the C bindings (that we don't use) for taglib

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

 extras/contrib/src/Patches/taglib-android.patch |   15 +++++++++++++++
 extras/contrib/src/contrib-src.mak              |    3 +++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Patches/taglib-android.patch b/extras/contrib/src/Patches/taglib-android.patch
new file mode 100644
index 0000000..55d288e
--- /dev/null
+++ b/extras/contrib/src/Patches/taglib-android.patch
@@ -0,0 +1,15 @@
+--- taglib-orig/bindings/c/CMakeLists.txt	2011-08-13 21:00:27.511266275 -0400
++++ taglib/bindings/c/CMakeLists.txt	2011-08-13 21:00:45.071292030 -0400
+@@ -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 )
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index a717c40..2cecbe5 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2242,6 +2242,9 @@ taglib-$(TAGLIB_VERSION).tar.gz:
 
 taglib: taglib-$(TAGLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_ANDROID
+	patch -p0 < Patches/taglib-android.patch
+endif
 ifdef HAVE_WIN32
 	patch -p0 < Patches/taglib-static.patch
 endif