From ade1e36c39262416205d27eb85d0854dd1a24bb9232233c962ff15d882355c24 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Sat, 1 Oct 2022 13:27:49 +0000 Subject: [PATCH] Accepting request 1007450 from home:gmbr3:Active - Use YUV_VERSION for library VERSION and YUV_VER_MAJOR for SOVERSION OBS-URL: https://build.opensuse.org/request/show/1007450 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libyuv?expand=0&rev=7 --- Don-t-install-conversion-tool.patch | 4 ++-- Use-a-proper-so-version.patch | 5 +++-- libyuv.changes | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Don-t-install-conversion-tool.patch b/Don-t-install-conversion-tool.patch index b93e0bb..30f15a4 100644 --- a/Don-t-install-conversion-tool.patch +++ b/Don-t-install-conversion-tool.patch @@ -9,8 +9,8 @@ index 1832ad42..854aea7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,15 +28,9 @@ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) - - SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES VERSION "0.0.0" SOVERSION 0 ) + INCLUDE ( CM_linux_packages.cmake ) + SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES VERSION ${YUV_VERSION} SOVERSION ${YUV_VER_MAJOR} ) -# this creates the conversion tool -ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) diff --git a/Use-a-proper-so-version.patch b/Use-a-proper-so-version.patch index 1f9d8ef..5167010 100644 --- a/Use-a-proper-so-version.patch +++ b/Use-a-proper-so-version.patch @@ -8,11 +8,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ed4948f0..e1f87062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,6 +30,8 @@ ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) +@@ -30,6 +30,9 @@ ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ) SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) -+SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES VERSION "0.0.0" SOVERSION 0 ) ++INCLUDE ( CM_linux_packages.cmake ) ++SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES VERSION ${YUV_VERSION} SOVERSION ${YUV_VER_MAJOR} ) + # this creates the conversion tool ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) diff --git a/libyuv.changes b/libyuv.changes index 463029a..fb2f57a 100644 --- a/libyuv.changes +++ b/libyuv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 1 13:03:58 UTC 2022 - Callum Farmer + +- Use YUV_VERSION for library VERSION and YUV_VER_MAJOR for + SOVERSION + ------------------------------------------------------------------- Sun Sep 25 12:22:58 UTC 2022 - Callum Farmer