taglib: Fix the build by adding the missing patches

7 files changed, 244 insertions, 3 deletions

diff --git a/recipes/taglib/0001-taglib-install-taglib-pc-on-windows-too.patch b/recipes/taglib/0001-taglib-install-taglob.pc-on-windows-too.patch
index 22436c21..63a368f6 100644
--- a/recipes/taglib/0001-taglib-install-taglib-pc-on-windows-too.patch
+++ b/recipes/taglib/0001-taglib-install-taglob.pc-on-windows-too.patch
@@ -1,8 +1,11 @@
 From 46d8ebcd329dc0927f0f20fd5908779fec3720f8 Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Thu, 3 May 2012 16:31:09 +0200
-Subject: taglib: install taglob.pc on windows too
+Subject: [PATCH 1/7] taglib: install taglob.pc on windows too
 
+---
+ CMakeLists.txt | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 5294fae..280ee3f 100644
@@ -31,6 +34,5 @@ index 5294fae..280ee3f 100644
  INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
  
 -- 
-cgit v0.10.2
-
+2.1.4
 
diff --git a/recipes/taglib/0002-fix-android-build-with-stlport.patch b/recipes/taglib/0002-fix-android-build-with-stlport.patch
new file mode 100644
index 00000000..7b3bb436
--- /dev/null
+++ b/recipes/taglib/0002-fix-android-build-with-stlport.patch
@@ -0,0 +1,63 @@
+From 3549c1131ba5fdceaed575c923d145e411281e81 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Wed, 12 Sep 2012 17:56:23 +0200
+Subject: [PATCH 2/7] fix android build with stlport
+
+---
+ CMakeLists.txt        | 17 +++++++++++++++--
+ taglib/CMakeLists.txt |  4 ++++
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5194af..82b3539 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,8 +24,13 @@ set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include"             CACHE
+ 
+ if (CMAKE_COMPILER_IS_GNUCXX)
+    if (CMAKE_SYSTEM_NAME MATCHES Linux)
+-     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+-     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long  -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++     if (ANDROID_NDK)
++     else (ANDROID_NDK)
++       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ")
++       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ")
++     endif (ANDROID_NDK)
+    endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -38,6 +43,14 @@ if (WIN32)
+   set(CMAKE_DEBUG_POSTFIX "d")
+ endif (WIN32)
+ 
++if (ANDROID_NDK)
++    include(FindPkgConfig)
++    pkg_check_modules (STLPORT stlport)
++    include_directories(${STLPORT_INCLUDE_DIRS}  )
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STLPORT_CFLAGS_OTHER}  ")
++    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STLPORT_CFLAGS_OTHER} ")
++endif (ANDROID_NDK)
++
+ SET(TAGLIB_LIB_MAJOR_VERSION "1")
+ SET(TAGLIB_LIB_MINOR_VERSION "7")
+ SET(TAGLIB_LIB_PATCH_VERSION "2")
+diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
+index f050a5c..9c4b7f1 100644
+--- a/taglib/CMakeLists.txt
++++ b/taglib/CMakeLists.txt
+@@ -203,6 +203,10 @@ if(ZLIB_FOUND)
+ 	TARGET_LINK_LIBRARIES(tag ${ZLIB_LIBRARIES})
+ endif(ZLIB_FOUND)
+ 
++if(ANDROID_NDK)
++	TARGET_LINK_LIBRARIES(tag  ${STLPORT_STATIC_LDFLAGS_OTHER})
++endif(ANDROID_NDK)
++
+ SET_TARGET_PROPERTIES(tag PROPERTIES
+         VERSION ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+         SOVERSION ${TAGLIB_LIB_MAJOR_VERSION}
+-- 
+2.1.4
+
diff --git a/recipes/taglib/0003-taglib.pc-require-stlport-for-android.patch b/recipes/taglib/0003-taglib.pc-require-stlport-for-android.patch
new file mode 100644
index 00000000..b2ad04f3
--- /dev/null
+++ b/recipes/taglib/0003-taglib.pc-require-stlport-for-android.patch
@@ -0,0 +1,38 @@
+From dcf4e27fe827b9bf21a1e896378597391ee5f251 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Wed, 12 Sep 2012 18:14:11 +0200
+Subject: [PATCH 3/7] taglib.pc: require stlport for android
+
+---
+ CMakeLists.txt  | 1 +
+ taglib.pc.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 82b3539..692a1e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,7 @@ endif (WIN32)
+ if (ANDROID_NDK)
+     include(FindPkgConfig)
+     pkg_check_modules (STLPORT stlport)
++    set (STLPORT_PC "stlport")
+     include_directories(${STLPORT_INCLUDE_DIRS}  )
+     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STLPORT_CFLAGS_OTHER}  ")
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STLPORT_CFLAGS_OTHER} ")
+diff --git a/taglib.pc.cmake b/taglib.pc.cmake
+index 909b8fc..4665641 100644
+--- a/taglib.pc.cmake
++++ b/taglib.pc.cmake
+@@ -5,7 +5,7 @@ includedir=${INCLUDE_INSTALL_DIR}
+ 
+ Name: TagLib
+ Description: Audio meta-data library
+-Requires: 
++Requires:  ${STLPORT_PC}
+ Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+ Libs: -L${LIB_INSTALL_DIR} -ltag
+ Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
+-- 
+2.1.4
+
diff --git a/recipes/taglib/0004-build-shared-and-static-libraries.patch b/recipes/taglib/0004-build-shared-and-static-libraries.patch
new file mode 100644
index 00000000..5a7bd11a
--- /dev/null
+++ b/recipes/taglib/0004-build-shared-and-static-libraries.patch
@@ -0,0 +1,41 @@
+From 0aa3e6d2e00d2fa540664b1473d8ae18b3ee3408 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Wed, 3 Oct 2012 17:25:26 +0200
+Subject: [PATCH 4/7] build shared and static libraries
+
+---
+ taglib/CMakeLists.txt | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
+index 9c4b7f1..d682667 100644
+--- a/taglib/CMakeLists.txt
++++ b/taglib/CMakeLists.txt
+@@ -191,12 +191,9 @@ SET(tag_LIB_SRCS ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_S
+ )
+ 
+ 
+-if(ENABLE_STATIC)
+-    add_library(tag STATIC ${tag_LIB_SRCS})
+-    set_target_properties(tag PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
+-else(ENABLE_STATIC)
+-    add_library(tag SHARED ${tag_LIB_SRCS})
+-endif(ENABLE_STATIC)
++add_library(tag_static STATIC ${tag_LIB_SRCS})
++set_target_properties(tag_static PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
++add_library(tag SHARED ${tag_LIB_SRCS})
+ 
+ TARGET_LINK_LIBRARIES(tag )
+ if(ZLIB_FOUND)
+@@ -214,7 +211,7 @@ SET_TARGET_PROPERTIES(tag PROPERTIES
+         DEFINE_SYMBOL MAKE_TAGLIB_LIB
+         LINK_INTERFACE_LIBRARIES ""
+ )
+-INSTALL(TARGETS tag
++INSTALL(TARGETS tag tag_static
+ 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ 	ARCHIVE DESTINATION  ${LIB_INSTALL_DIR}
+-- 
+2.1.4
+
diff --git a/recipes/taglib/0005-Use-gnustl-instead-of-stlport.patch b/recipes/taglib/0005-Use-gnustl-instead-of-stlport.patch
new file mode 100644
index 00000000..f93f6ece
--- /dev/null
+++ b/recipes/taglib/0005-Use-gnustl-instead-of-stlport.patch
@@ -0,0 +1,47 @@
+From c3129953f17cad928e74582fa697ba3342d465aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Thu, 25 Oct 2012 10:52:57 +0200
+Subject: [PATCH 5/7] Use gnustl instead of stlport
+
+---
+ CMakeLists.txt        | 10 +++++-----
+ taglib/CMakeLists.txt |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 692a1e4..8142895 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,11 +45,11 @@ endif (WIN32)
+ 
+ if (ANDROID_NDK)
+     include(FindPkgConfig)
+-    pkg_check_modules (STLPORT stlport)
+-    set (STLPORT_PC "stlport")
+-    include_directories(${STLPORT_INCLUDE_DIRS}  )
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STLPORT_CFLAGS_OTHER}  ")
+-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STLPORT_CFLAGS_OTHER} ")
++    pkg_check_modules (GNUSTL gnustl)
++    set (GNUSTL_PC "gnustl")
++    include_directories(${GNUSTL_INCLUDE_DIRS}  )
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GNUSTL_CFLAGS_OTHER}  ")
++    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GNUSTL_CFLAGS_OTHER} ")
+ endif (ANDROID_NDK)
+ 
+ SET(TAGLIB_LIB_MAJOR_VERSION "1")
+diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
+index d682667..6358657 100644
+--- a/taglib/CMakeLists.txt
++++ b/taglib/CMakeLists.txt
+@@ -201,7 +201,7 @@ if(ZLIB_FOUND)
+ endif(ZLIB_FOUND)
+ 
+ if(ANDROID_NDK)
+-	TARGET_LINK_LIBRARIES(tag  ${STLPORT_STATIC_LDFLAGS_OTHER})
++	TARGET_LINK_LIBRARIES(tag  ${GNUSTL_STATIC_LDFLAGS_OTHER})
+ endif(ANDROID_NDK)
+ 
+ SET_TARGET_PROPERTIES(tag PROPERTIES
+-- 
+2.1.4
+
diff --git a/recipes/taglib/0006-Link-C-bindings-with-STL-too.patch b/recipes/taglib/0006-Link-C-bindings-with-STL-too.patch
new file mode 100644
index 00000000..b0540cf5
--- /dev/null
+++ b/recipes/taglib/0006-Link-C-bindings-with-STL-too.patch
@@ -0,0 +1,25 @@
+From 2aae96f6e06270cf3a9597a2a2e04c823f0eb706 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Thu, 25 Oct 2012 11:26:56 +0200
+Subject: [PATCH 6/7] Link C bindings with STL too
+
+---
+ bindings/c/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
+index 79c7a6b..542f3a3 100644
+--- a/bindings/c/CMakeLists.txt
++++ b/bindings/c/CMakeLists.txt
+@@ -24,7 +24,7 @@ if(ENABLE_STATIC)
+     set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
+ endif(ENABLE_STATIC)
+ 
+-TARGET_LINK_LIBRARIES(tag_c  tag )
++TARGET_LINK_LIBRARIES(tag_c  tag ${GNUSTL_STATIC_LDFLAGS_OTHER})
+ 
+ # On Solaris we need to explicitly add the C++ standard and runtime
+ # libraries to the libs used by the C bindings, because those C bindings
+-- 
+2.1.4
+
diff --git a/recipes/taglib/0007-Fix-pkg-config-file.patch b/recipes/taglib/0007-Fix-pkg-config-file.patch
new file mode 100644
index 00000000..7bb5e0c2
--- /dev/null
+++ b/recipes/taglib/0007-Fix-pkg-config-file.patch
@@ -0,0 +1,25 @@
+From a092425ed89444410bd61782f536d6fc584dc010 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Thu, 25 Oct 2012 11:44:26 +0200
+Subject: [PATCH 7/7] Fix pkg-config file
+
+---
+ taglib.pc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/taglib.pc.cmake b/taglib.pc.cmake
+index 4665641..ebd5b15 100644
+--- a/taglib.pc.cmake
++++ b/taglib.pc.cmake
+@@ -5,7 +5,7 @@ includedir=${INCLUDE_INSTALL_DIR}
+ 
+ Name: TagLib
+ Description: Audio meta-data library
+-Requires:  ${STLPORT_PC}
++Requires:  ${GNUSTL_PC}
+ Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+ Libs: -L${LIB_INSTALL_DIR} -ltag
+ Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
+-- 
+2.1.4
+