diff options
| -rw-r--r-- | meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch | 26 |
2 files changed, 0 insertions, 61 deletions
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 @@ | |||
| 1 | From 25e12cf5918884f232cebc34c92bd548fe40c2b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anonymous Maarten <anonymous.maarten@gmail.com> | ||
| 3 | Date: Fri, 9 Dec 2022 19:13:09 +0100 | ||
| 4 | Subject: [PATCH] cmake: extract libtool from configure.ac and convert to | ||
| 5 | SOVERSION | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/25e12cf5918884f232cebc34c92bd548fe40c2b3] | ||
| 8 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
| 9 | --- | ||
| 10 | CMakeLists.txt | 12 ++++++++++++ | ||
| 11 | 1 file changed, 12 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 14 | index adc73b09..7ae5043f 100644 | ||
| 15 | --- a/CMakeLists.txt | ||
| 16 | +++ b/CMakeLists.txt | ||
| 17 | @@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.2) | ||
| 18 | |||
| 19 | project(WavPack VERSION 5.6.0) | ||
| 20 | |||
| 21 | +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) | ||
| 22 | +string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") | ||
| 23 | +set(LT_CURRENT "${CMAKE_MATCH_1}") | ||
| 24 | +string(REGEX MATCH "LT_REVISION=([0-9]+)" LT_REVISION "${CONFIGURE_AC}") | ||
| 25 | +set(LT_REVISION "${CMAKE_MATCH_1}") | ||
| 26 | +string(REGEX MATCH "LT_AGE=([0-9]+)" LT_AGE "${CONFIGURE_AC}") | ||
| 27 | +set(LT_AGE "${CMAKE_MATCH_1}") | ||
| 28 | + | ||
| 29 | +math(EXPR SOVERSION_MAJOR "${LT_CURRENT}-${LT_AGE}") | ||
| 30 | +math(EXPR SOVERSION_MINOR "${LT_AGE}") | ||
| 31 | +math(EXPR SOVERSION_MICRO "${LT_REVISION}") | ||
| 32 | + | ||
| 33 | # Languages | ||
| 34 | |||
| 35 | 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 @@ | |||
| 1 | From 7c1dd729302b7f77f65884df4e79301df1490423 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anonymous Maarten <anonymous.maarten@gmail.com> | ||
| 3 | Date: Fri, 9 Dec 2022 19:23:51 +0100 | ||
| 4 | Subject: [PATCH] cmake: set SOVERSION and VERSION property of wavpack | ||
| 5 | |||
| 6 | This is used to version .so libraries on Linux | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/7c1dd729302b7f77f65884df4e79301df1490423] | ||
| 9 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
| 10 | --- | ||
| 11 | CMakeLists.txt | 2 ++ | ||
| 12 | 1 file changed, 2 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 15 | index 7ae5043f..285b295b 100644 | ||
| 16 | --- a/CMakeLists.txt | ||
| 17 | +++ b/CMakeLists.txt | ||
| 18 | @@ -361,6 +361,8 @@ if(BUILD_SHARED_LIBS) | ||
| 19 | target_link_directories(wavpack PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym") | ||
| 20 | endif() | ||
| 21 | else() | ||
| 22 | + set_target_properties(wavpack PROPERTIES SOVERSION "${SOVERSION_MAJOR}") | ||
| 23 | + set_target_properties(wavpack PROPERTIES VERSION "${SOVERSION_MAJOR}.${SOVERSION_MINOR}.${SOVERSION_MICRO}") | ||
| 24 | set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym;\n};\n\nVERS_2 {\n global: sym;\n} VERS_1;\n") | ||
| 25 | file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") | ||
| 26 | check_c_linker_flag("-Wl,--version-script=${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map" COMPILER_SUPPORTS_SYMBOL_MAPS) | ||
