[packages/avcap] - fill Libs.private in .pc file, drop .la file; release 4
qboosh
qboosh at pld-linux.org
Mon Jun 1 21:29:36 CEST 2026
commit 4e3340169feff7748e0ac8ae35f375775e3725b5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jun 1 21:29:39 2026 +0200
- fill Libs.private in .pc file, drop .la file; release 4
avcap-link.patch | 22 ++++++++++++++++++++++
avcap.spec | 14 ++++++++------
2 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/avcap.spec b/avcap.spec
index 92ef2cb..5cc4fed 100644
--- a/avcap.spec
+++ b/avcap.spec
@@ -2,7 +2,7 @@ Summary: Cross-platform, API-independent C++ video capture library
Summary(pl.UTF-8): Wieloplatformowa, niezależna od API biblioteka C++ do przechwytywania obrazu
Name: avcap
Version: 0.1.9
-Release: 3
+Release: 4
License: GPL v3+
Group: Libraries
Source0: https://downloads.sourceforge.net/libavcap/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Patch1: %{name}-c++.patch
Patch2: %{name}-install.patch
Patch3: %{name}-automake.patch
Patch4: %{name}-assert-func.patch
+Patch5: %{name}-link.patch
URL: https://libavcap.sourceforge.net/
BuildRequires: autoconf >= 2.56
BuildRequires: automake
@@ -88,6 +89,7 @@ Dokumentacja API biblioteki avcap.
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
+%patch -P5 -p1
# keep AX_PREFIX_CONFIG_H, kill libtool macros
head -n 87 acinclude.m4 > acinclude.m4.tmp
@@ -109,7 +111,8 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# .la kept, *.private dependencies are missing in .pc
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libavcap.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -121,13 +124,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
%attr(755,root,root) %{_bindir}/captest
-%attr(755,root,root) %{_libdir}/libavcap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcap.so.6
+%{_libdir}/libavcap.so.*.*.*
+%ghost %{_libdir}/libavcap.so.6
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libavcap.so
-%{_libdir}/libavcap.la
+%{_libdir}/libavcap.so
%{_includedir}/avcap
%{_pkgconfigdir}/avcap.pc
diff --git a/avcap-link.patch b/avcap-link.patch
new file mode 100644
index 0000000..f138a56
--- /dev/null
+++ b/avcap-link.patch
@@ -0,0 +1,22 @@
+--- avcap-0.1.9/avcap/Makefile.am.orig 2026-06-01 20:38:54.915973119 +0200
++++ avcap-0.1.9/avcap/Makefile.am 2026-06-01 20:39:25.319141744 +0200
+@@ -9,9 +9,8 @@ libavcap_la_SOURCES = \
+ ConnectorManager.cpp DeviceCollector.cpp IOBuffer.cpp\
+ ControlManager.cpp DeviceDescriptor.cpp
+
+-libavcap_la_LIBADD = $(PLATFORM_LIB)
++libavcap_la_LIBADD = $(PLATFORM_LIB) $(AVCAP_DEPS_LIBS)
+ libavcap_la_LDFLAGS = \
+- $(AVCAP_DEPS_LIBS) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ # -release $(LT_RELEASE)
+
+--- avcap-0.1.9/avcap.pc.in.orig 2026-06-01 20:39:34.589091525 +0200
++++ avcap-0.1.9/avcap.pc.in 2026-06-01 20:39:52.885659070 +0200
+@@ -7,5 +7,5 @@ Name: avcap
+ Description: Cross-platform, API-independent C++ video capture library
+ Version: @AVCAP_VERSION@
+ Libs: -L${libdir} -lavcap @OSLIBS@
+-Libs.private: @LIBS@
++Libs.private: @LIBS@ @AVCAP_DEPS_LIBS@
+ Cflags: -I${includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avcap.git/commitdiff/4e3340169feff7748e0ac8ae35f375775e3725b5
More information about the pld-cvs-commit
mailing list