Signed-off-by: Khem Raj <[email protected]> --- ...act-libtool-and-convert-to-soversion.patch | 35 ------------------- .../files/set-soversion-and-version.patch | 26 -------------- 2 files changed, 61 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch delete mode 100644 meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch
diff --git a/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch b/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch deleted file mode 100644 index d66ad4f268..0000000000 --- a/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 25e12cf5918884f232cebc34c92bd548fe40c2b3 Mon Sep 17 00:00:00 2001 -From: Anonymous Maarten <[email protected]> -Date: Fri, 9 Dec 2022 19:13:09 +0100 -Subject: [PATCH] cmake: extract libtool from configure.ac and convert to - SOVERSION - -Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/25e12cf5918884f232cebc34c92bd548fe40c2b3] -Signed-off-by: alperak <[email protected]> ---- - CMakeLists.txt | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index adc73b09..7ae5043f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.2) - - project(WavPack VERSION 5.6.0) - -+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) -+string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") -+set(LT_CURRENT "${CMAKE_MATCH_1}") -+string(REGEX MATCH "LT_REVISION=([0-9]+)" LT_REVISION "${CONFIGURE_AC}") -+set(LT_REVISION "${CMAKE_MATCH_1}") -+string(REGEX MATCH "LT_AGE=([0-9]+)" LT_AGE "${CONFIGURE_AC}") -+set(LT_AGE "${CMAKE_MATCH_1}") -+ -+math(EXPR SOVERSION_MAJOR "${LT_CURRENT}-${LT_AGE}") -+math(EXPR SOVERSION_MINOR "${LT_AGE}") -+math(EXPR SOVERSION_MICRO "${LT_REVISION}") -+ - # Languages - - include(CheckLanguage) diff --git a/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch b/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch deleted file mode 100644 index faddb7b754..0000000000 --- a/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7c1dd729302b7f77f65884df4e79301df1490423 Mon Sep 17 00:00:00 2001 -From: Anonymous Maarten <[email protected]> -Date: Fri, 9 Dec 2022 19:23:51 +0100 -Subject: [PATCH] cmake: set SOVERSION and VERSION property of wavpack - -This is used to version .so libraries on Linux - -Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/7c1dd729302b7f77f65884df4e79301df1490423] -Signed-off-by: alperak <[email protected]> ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ae5043f..285b295b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -361,6 +361,8 @@ if(BUILD_SHARED_LIBS) - target_link_directories(wavpack PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym") - endif() - else() -+ set_target_properties(wavpack PROPERTIES SOVERSION "${SOVERSION_MAJOR}") -+ set_target_properties(wavpack PROPERTIES VERSION "${SOVERSION_MAJOR}.${SOVERSION_MINOR}.${SOVERSION_MICRO}") - set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym;\n};\n\nVERS_2 {\n global: sym;\n} VERS_1;\n") - file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") - check_c_linker_flag("-Wl,--version-script=${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map" COMPILER_SUPPORTS_SYMBOL_MAPS)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122650): https://lists.openembedded.org/g/openembedded-devel/message/122650 Mute This Topic: https://lists.openembedded.org/mt/116774779/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
