From ec81636d7e414960acdd48ed79b2198b5e2d79f1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 22 Sep 2022 13:23:25 +0200 Subject: [PATCH] Add libwebp_libsuffix.patch --- libwebp.spec | 7 ++++++- libwebp_libsuffix.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 libwebp_libsuffix.patch diff --git a/libwebp.spec b/libwebp.spec index 7b7fa1f..f1592c8 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -8,7 +8,7 @@ Name: libwebp Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://webmproject.org/ Summary: Library and tools for the WebP graphics format # Additional IPR is licensed as well. See PATENTS file for details @@ -21,6 +21,8 @@ Patch0: libwebp-freeglut.patch Patch1: libwebp-mingw-libsuffix.patch # Fix cmake module install location Patch2: libwebp-cmakedir.patch +# Honour libsuffix in libdir set in pkgconfig files +Patch3: libwebp_libsuffix.patch BuildRequires: cmake BuildRequires: freeglut-devel @@ -255,6 +257,9 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %changelog +* Thu Sep 22 2022 Sandro Mani - 1.2.4-2 +- Add libwebp_libsuffix.patch + * Sun Aug 07 2022 Sandro Mani - 1.2.4-1 - Update to 1.2.4 diff --git a/libwebp_libsuffix.patch b/libwebp_libsuffix.patch new file mode 100644 index 0000000..692a867 --- /dev/null +++ b/libwebp_libsuffix.patch @@ -0,0 +1,12 @@ +diff -rupN libwebp-1.2.4/CMakeLists.txt libwebp-1.2.4-new/CMakeLists.txt +--- libwebp-1.2.4/CMakeLists.txt 2022-08-06 01:49:26.000000000 +0200 ++++ libwebp-1.2.4-new/CMakeLists.txt 2022-09-22 12:56:18.542998584 +0200 +@@ -112,7 +112,7 @@ endif() + + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\$\{prefix\}") +-set(libdir "\$\{prefix\}/lib") ++set(libdir "\$\{prefix\}/lib${LIB_SUFFIX}") + set(includedir "\$\{prefix\}/include") + set(PTHREAD_LIBS ${CMAKE_THREAD_LIBS_INIT}) + set(INSTALLED_LIBRARIES)