[packages/guvcview] up to 2.2.1

atler atler at pld-linux.org
Fri Nov 15 02:27:14 CET 2024 

commit 56797a4101e394c4f6f0b85538c8bca31543a877
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Nov 15 00:32:23 2024 +0100

    up to 2.2.1
    
    - uses cmake now
    - patch to add missing linking with math library
    - patch to correct arch independent pkgconfig dir to arch dependent one

 guvcview.spec   | 89 +++++++++++++++++++--------------------------------------
 link-math.patch | 22 ++++++++++++++
 pc-path.patch   | 44 ++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 59 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 689f765..e887577 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,37 +1,34 @@
 # NOTE: possible switches:
 # - sfml rendering (BR: sfml-graphics >= 2.0) instead of SDL2
-# - Qt5 gui (BR: Qt5Widgets, qt5-build) instead of gtk+3
+# - Qt6 gui (BR: Qt6Core Qt6Gui Qt6Widgets, qt5-build) instead of gtk+3
 # All can be compiled in, selectable at runtime.
-#
-# Conditional build:
-%bcond_without	static_libs	# static libraries
 
 Summary:	GTK+ based UVC Viewer
 Summary(pl.UTF-8):	Przeglądarka UVC oparta na GTK+
 Name:		guvcview
-Version:	2.1.0
-Release:	2
+Version:	2.2.1
+Release:	1
 License:	GPL v3
 Group:		Applications/Multimedia
 Source0:	https://downloads.sourceforge.net/guvcview/%{name}-src-%{version}.tar.bz2
-# Source0-md5:	43593ab63c9fa7e31105d6552d926bf4
+# Source0-md5:	8dc549d6cf65b496bcd924ed3539142e
+Patch0:		link-math.patch
+Patch1:		pc-path.patch
 URL:		http://guvcview.sourceforge.net/
 BuildRequires:	SDL2-devel >= 2.0
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
+BuildRequires:	cmake >= 3.14
 BuildRequires:	ffmpeg-devel >= 3.0
 BuildRequires:	glib2-devel >= 1:2.10.0
 BuildRequires:	gsl-devel >= 1.15
 BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	intltool >= 0.40
 BuildRequires:	libpng-devel
-BuildRequires:	libtool
+BuildRequires:	libstdc++-devel >= 6:8
 BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	libv4l-devel
 BuildRequires:	pkgconfig
 BuildRequires:	portaudio-devel >= 19
 BuildRequires:	pulseaudio-devel >= 0.9.15
-BuildRequires:	rpmbuild(macros) >= 1.527
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	udev-devel
 Requires(post,postun):	desktop-file-utils
 Requires:	ffmpeg-libs >= 3.0
@@ -53,6 +50,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek guvcview
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	udev-devel
+Obsoletes:	guvcview-static < 2.2.1
 
 %description devel
 Header files for guvcview libraries.
@@ -60,43 +58,22 @@ Header files for guvcview libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek guvcview.
 
-%package static
-Summary:	Static guvcview libraries
-Summary(pl.UTF-8):	Statyczne biblioteki guvcview
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static guvcview libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki guvcview.
-
 %prep
 %setup -q -n %{name}-src-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	%{__enable_disable static_libs static} \
-	--disable-debian-menu \
-	--disable-silent-rules
-%{__make}
+%cmake -B build \
+	-DINSTALL_DEVKIT:BOOL=ON
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgview*.la
-
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
-
 %find_lang %{name}
 %find_lang gview_v4l2core -a %{name}.lang
 
@@ -115,17 +92,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README.md
 %attr(755,root,root) %{_bindir}/guvcview
-%attr(755,root,root) %{_libdir}/libgviewaudio-2.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgviewaudio-2.2.so.2
-%attr(755,root,root) %{_libdir}/libgviewencoder-2.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgviewencoder-2.2.so.2
-%attr(755,root,root) %{_libdir}/libgviewrender-2.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgviewrender-2.2.so.2
-%attr(755,root,root) %{_libdir}/libgviewv4l2core-2.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgviewv4l2core-2.2.so.2
-%{_datadir}/metainfo/guvcview.appdata.xml
+%attr(755,root,root) %{_libdir}/libgviewaudio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewaudio.so.2
+%attr(755,root,root) %{_libdir}/libgviewencoder.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewencoder.so.2
+%attr(755,root,root) %{_libdir}/libgviewrender.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewrender.so.2
+%attr(755,root,root) %{_libdir}/libgviewv4l2core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewv4l2core.so.2
+%{_datadir}/appdata/guvcview.appdata.xml
 %{_desktopdir}/guvcview.desktop
-%{_pixmapsdir}/guvcview
+%{_pixmapsdir}/guvcview.png
 %{_mandir}/man1/guvcview.1*
 
 %files devel
@@ -134,17 +111,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgviewencoder.so
 %attr(755,root,root) %{_libdir}/libgviewrender.so
 %attr(755,root,root) %{_libdir}/libgviewv4l2core.so
-%{_includedir}/guvcview-2
+%{_includedir}/gviewaudio.h
+%{_includedir}/gviewencoder.h
+%{_includedir}/gviewrender.h
+%{_includedir}/gviewv4l2core.h
 %{_pkgconfigdir}/libgviewaudio.pc
 %{_pkgconfigdir}/libgviewencoder.pc
 %{_pkgconfigdir}/libgviewrender.pc
 %{_pkgconfigdir}/libgviewv4l2core.pc
-
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgviewaudio.a
-%{_libdir}/libgviewencoder.a
-%{_libdir}/libgviewrender.a
-%{_libdir}/libgviewv4l2core.a
-%endif
diff --git a/link-math.patch b/link-math.patch
new file mode 100644
index 0000000..a53e546
--- /dev/null
+++ b/link-math.patch
@@ -0,0 +1,22 @@
+--- guvcview-src-2.2.1/gview_encoder/CMakeLists.txt.orig	2024-11-02 14:15:33.000000000 +0100
++++ guvcview-src-2.2.1/gview_encoder/CMakeLists.txt	2024-11-15 00:04:16.376946665 +0100
+@@ -24,7 +24,7 @@
+ 
+ pkg_check_modules(FFMPEG REQUIRED libavcodec libavutil)
+ 
+-target_link_libraries(gviewencoder ${FFMPEG_LIBRARIES})
++target_link_libraries(gviewencoder m ${FFMPEG_LIBRARIES})
+ add_definitions(${FFMPEG_CFLAGS} ${FFMPEG_CFLAGS_OTHER})
+ 
+ include_directories(${CMAKE_SOURCE_DIR}/includes)
+--- guvcview-src-2.2.1/gview_v4l2core/CMakeLists.txt.orig	2024-11-02 14:15:33.000000000 +0100
++++ guvcview-src-2.2.1/gview_v4l2core/CMakeLists.txt	2024-11-15 00:07:05.502171037 +0100
+@@ -31,7 +31,7 @@
+ pkg_check_modules(V4L2 REQUIRED
+   libv4l2 libudev libusb-1.0 libavcodec>=57.16 libavutil libpng)
+ 
+-target_link_libraries(gviewv4l2core ${V4L2_LIBRARIES})
++target_link_libraries(gviewv4l2core m ${V4L2_LIBRARIES})
+ add_definitions(${V4L2_CFLAGS} ${V4L2_CFLAGS_OTHER})
+ 
+ add_compile_definitions(GETTEXT_PACKAGE_V4L2CORE="gview_v4l2core")
diff --git a/pc-path.patch b/pc-path.patch
new file mode 100644
index 0000000..c655ad4
--- /dev/null
+++ b/pc-path.patch
@@ -0,0 +1,44 @@
+--- guvcview-src-2.2.1/gview_audio/CMakeLists.txt.orig	2024-11-02 14:15:33.000000000 +0100
++++ guvcview-src-2.2.1/gview_audio/CMakeLists.txt	2024-11-15 00:20:20.336468471 +0100
+@@ -42,7 +42,7 @@
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gviewaudio.h TYPE INCLUDE)
+   install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/libgviewaudio.pc
+-    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig
++    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig
+   )
+ endif()
+ 
+--- guvcview-src-2.2.1/gview_v4l2core/CMakeLists.txt.orig	2024-11-15 00:13:08.125288470 +0100
++++ guvcview-src-2.2.1/gview_v4l2core/CMakeLists.txt	2024-11-15 00:20:41.492540618 +0100
+@@ -44,7 +44,7 @@
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gviewv4l2core.h TYPE INCLUDE)
+   install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/libgviewv4l2core.pc
+-    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig
++    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig
+   )
+ endif()
+ 
+--- guvcview-src-2.2.1/gview_encoder/CMakeLists.txt.orig	2024-11-15 00:13:08.125288470 +0100
++++ guvcview-src-2.2.1/gview_encoder/CMakeLists.txt	2024-11-15 00:21:46.050726577 +0100
+@@ -36,7 +36,7 @@
+ 
+   install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/libgviewencoder.pc
+-    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig
++    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig
+   )
+ endif()
+ 
+--- guvcview-src-2.2.1/gview_render/CMakeLists.txt.orig	2024-11-02 14:15:33.000000000 +0100
++++ guvcview-src-2.2.1/gview_render/CMakeLists.txt	2024-11-15 00:22:07.070135990 +0100
+@@ -53,7 +53,7 @@
+ 
+   install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/libgviewrender.pc
+-    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig
++    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig
+   )
+ endif()
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guvcview.git/commitdiff/56797a4101e394c4f6f0b85538c8bca31543a877

More information about the pld-cvs-commit mailing list