diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-12-18 11:40:10 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-12-18 11:40:10 +0200 |
| commit | ca2dc768dbf64d96f3b32d0e98379eb3b072ced3 (patch) | |
| tree | a1028df035d6d91466383e10f2c559a125db04fc /recipes | |
| parent | 0ae9e4292e77d04c411191ff70d0db0ce6099eca (diff) | |
taglib: Fix pkg-config file generation
Only @ variables are replaced now, not all of them
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/taglib/0001-Link-with-correct-STL-on-Android.patch | 8 | ||||
| -rw-r--r-- | recipes/taglib/0002-Build-a-static-and-non-static-version.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes/taglib/0001-Link-with-correct-STL-on-Android.patch b/recipes/taglib/0001-Link-with-correct-STL-on-Android.patch index b144efb0..30fe1054 100644 --- a/recipes/taglib/0001-Link-with-correct-STL-on-Android.patch +++ b/recipes/taglib/0001-Link-with-correct-STL-on-Android.patch @@ -1,7 +1,7 @@ -From 98eeb9a724b145f6b51fbc2e127de929343b66e1 Mon Sep 17 00:00:00 2001 +From 7d759960c628ecaff5f80a8c6c42842ecd96829d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> Date: Sat, 17 Dec 2016 22:39:47 +0200 -Subject: [PATCH] Link with correct STL on Android +Subject: [PATCH 1/2] Link with correct STL on Android --- CMakeLists.txt | 15 +++++++++++---- @@ -50,7 +50,7 @@ index 387f1bd..c4aafc6 100644 if(BUILD_FRAMEWORK) set_target_properties(tag_c PROPERTIES FRAMEWORK TRUE) diff --git a/taglib.pc.cmake b/taglib.pc.cmake -index ba9d655..268845e 100644 +index ba9d655..5f42e0b 100644 --- a/taglib.pc.cmake +++ b/taglib.pc.cmake @@ -5,7 +5,7 @@ includedir=@INCLUDE_INSTALL_DIR@ @@ -58,7 +58,7 @@ index ba9d655..268845e 100644 Name: TagLib Description: Audio meta-data library -Requires: -+Requires: ${GNUSTL_PC} ++Requires: @GNUSTL_PC@ Version: @TAGLIB_LIB_VERSION_STRING@ Libs: -L${libdir} -ltag Cflags: -I${includedir}/taglib diff --git a/recipes/taglib/0002-Build-a-static-and-non-static-version.patch b/recipes/taglib/0002-Build-a-static-and-non-static-version.patch index bbb17ac3..872880c8 100644 --- a/recipes/taglib/0002-Build-a-static-and-non-static-version.patch +++ b/recipes/taglib/0002-Build-a-static-and-non-static-version.patch @@ -1,4 +1,4 @@ -From 218e8693604e76397a22fef217a671295a0cf210 Mon Sep 17 00:00:00 2001 +From 0ce96f3b8d9cd146f1c18c4f651c208a8884f7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> Date: Sat, 17 Dec 2016 22:56:41 +0200 Subject: [PATCH 2/2] Build a static and non-static version |