From b21a1e0384135b77c37a9193393a0f670a981f41 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 1 Dec 2014 21:06:29 +0000 Subject: [PATCH] taglib-1.9.1: fix pkgconfig and taglib-config paths. --- .../taglib/patches/taglib-1.9.1.patchset | 90 +++++++++++++++++-- media-libs/taglib/taglib-1.9.1.recipe | 9 +- 2 files changed, 92 insertions(+), 7 deletions(-) diff --git a/media-libs/taglib/patches/taglib-1.9.1.patchset b/media-libs/taglib/patches/taglib-1.9.1.patchset index b6e3e1582..1323d4c74 100644 --- a/media-libs/taglib/patches/taglib-1.9.1.patchset +++ b/media-libs/taglib/patches/taglib-1.9.1.patchset @@ -1,13 +1,10 @@ -From 8908d52f9a172d2f9f043efbe96cc1f729cfd8db Mon Sep 17 00:00:00 2001 +From 8e61a871325a69274ca4002342dbe29a666ff83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 15 Aug 2014 23:32:38 +0200 -Subject: [PATCH] Drop FORCE from install dir variables +Subject: Drop FORCE from install dir variables Why the hell force users to install to places that only fit a specific OS? No need to use CMake then... ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 317ffa1..e0b86b7 100644 @@ -31,3 +28,86 @@ index 317ffa1..e0b86b7 100644 -- 1.8.3.4 + +From a277f4a1ef09a828a10aa9136e555a3eb6e8dc4c Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 1 Dec 2014 21:02:22 +0000 +Subject: fix pkgconfig paths + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0b86b7..8581dfc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,7 +77,7 @@ if(WIN32) + endif() + + if(NOT WIN32 AND NOT BUILD_FRAMEWORK) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc ) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc @ONLY ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + endif() + +diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt +index 2d9dafc..94ea8c9 100644 +--- a/bindings/c/CMakeLists.txt ++++ b/bindings/c/CMakeLists.txt +@@ -62,7 +62,7 @@ install(TARGETS tag_c + ) + + if(NOT WIN32 AND NOT BUILD_FRAMEWORK) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + endif() + +diff --git a/bindings/c/taglib_c.pc.cmake b/bindings/c/taglib_c.pc.cmake +index 61764fc..5450582 100644 +--- a/bindings/c/taglib_c.pc.cmake ++++ b/bindings/c/taglib_c.pc.cmake +@@ -1,12 +1,12 @@ +-prefix=${CMAKE_INSTALL_PREFIX} +-exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${LIB_INSTALL_DIR} +-includedir=${INCLUDE_INSTALL_DIR} ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=@LIB_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + + Name: TagLib C Bindings + Description: Audio meta-data library (C bindings) + Requires: taglib +-Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} +-Libs: -L${LIB_INSTALL_DIR} -ltag_c +-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib ++Version: @TAGLIB_LIB_MAJOR_VERSION@.@TAGLIB_LIB_MINOR_VERSION@.@TAGLIB_LIB_PATCH_VERSION@ ++Libs: -L${libdir} -ltag_c ++Cflags: -I${includedir}/taglib +diff --git a/taglib.pc.cmake b/taglib.pc.cmake +index 909b8fc..8a5159d 100644 +--- a/taglib.pc.cmake ++++ b/taglib.pc.cmake +@@ -1,11 +1,11 @@ +-prefix=${CMAKE_INSTALL_PREFIX} +-exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${LIB_INSTALL_DIR} +-includedir=${INCLUDE_INSTALL_DIR} ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=@LIB_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: TagLib + Description: Audio meta-data library + Requires: +-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 ++Version: @TAGLIB_LIB_MAJOR_VERSION@.@TAGLIB_LIB_MINOR_VERSION@.@TAGLIB_LIB_PATCH_VERSION@ ++Libs: -L${libdir} -ltag ++Cflags: -I${includedir}/taglib +-- +1.8.3.4 + diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe index f8a75e7a0..3012f4cef 100644 --- a/media-libs/taglib/taglib-1.9.1.recipe +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -9,9 +9,9 @@ COPYRIGHT="2002-2013 Scott Wheeler" LICENSE="GNU LGPL v2 MPL v1.1 " -REVISION="1" +REVISION="2" -ARCHITECTURES="x86 !x86_64" +ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -64,6 +64,11 @@ INSTALL() libtag_c fixPkgconfig + + fixDevelopLibDirReferences $binDir/taglib-config + sed -i -e "s,\/.*/include,$includeDir," $binDir/taglib-config + + exit 1 # devel package packageEntries devel \