[packages/libwebp] - updated dependencies (+use cmake 3.13+ invocation), made static_libs bcond work again

qboosh qboosh at pld-linux.org
Sun Nov 30 21:40:49 CET 2025


commit 797e303fa3316bdb0861e7424501344c494a69a7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 30 21:40:59 2025 +0100

    - updated dependencies (+use cmake 3.13+ invocation), made static_libs bcond work again

 libwebp.spec | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/libwebp.spec b/libwebp.spec
index e434b1e..96dca7e 100644
--- a/libwebp.spec
+++ b/libwebp.spec
@@ -17,12 +17,12 @@ Patch0:		cmake-dir.patch
 URL:		https://developers.google.com/speed/webp/
 %{?with_opengl:BuildRequires:	OpenGL-devel}
 %{?with_opengl:BuildRequires:	OpenGL-glut-devel}
-BuildRequires:	cmake
+BuildRequires:	cmake >= 3.16
 BuildRequires:	giflib-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	rpmbuild(macros) >= 1.527
+BuildRequires:	rpmbuild(macros) >= 1.605
 Requires:	libsharpyuv = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -109,14 +109,25 @@ Statyczna biblioteka Sharp YUV.
 %patch -P0 -p1
 
 %build
-mkdir -p build
-cd build
-%cmake ../
-%{__make}
+%if %{with static_libs}
+%cmake -B build-static \
+	-DBUILD_SHARED_LIBS=OFF
+
+%{__make} -C build-static
+%endif
+
+%cmake -B build
+
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with static_libs}
+%{__make} -C build-static install \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
+
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -158,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libwebp.a
+%{_libdir}/libwebpdecoder.a
 %{_libdir}/libwebpdemux.a
 %{_libdir}/libwebpmux.a
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libwebp.git/commitdiff/797e303fa3316bdb0861e7424501344c494a69a7




More information about the pld-cvs-commit mailing list