diff --git a/0001-Fix-build-with-GCC-14.patch b/0001-Fix-build-with-GCC-14.patch deleted file mode 100644 index 3002340..0000000 --- a/0001-Fix-build-with-GCC-14.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 98feb36a5f4971ca152b2d90a923008d0bd6cf5f Mon Sep 17 00:00:00 2001 -From: Christophe Marin -Date: Tue, 27 Aug 2024 10:31:02 +0200 -Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20GCC=C2=A014?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - gview_v4l2core/jpeg_decoder.c | 1 + - gview_v4l2core/uvc_h264.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/gview_v4l2core/jpeg_decoder.c b/gview_v4l2core/jpeg_decoder.c -index 9d30ea2..d60fdf8 100644 ---- a/gview_v4l2core/jpeg_decoder.c -+++ b/gview_v4l2core/jpeg_decoder.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #include "gviewv4l2core.h" - #include "colorspaces.h" -diff --git a/gview_v4l2core/uvc_h264.c b/gview_v4l2core/uvc_h264.c -index ed0c6a8..a02271e 100644 ---- a/gview_v4l2core/uvc_h264.c -+++ b/gview_v4l2core/uvc_h264.c -@@ -24,6 +24,7 @@ - /* support for internationalization - i18n */ - #include - #include -+#include - #include - #include - #include --- -2.46.0 - diff --git a/_multibuild b/_multibuild deleted file mode 100644 index de9a3e0..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - qt5 - diff --git a/fix-linking.patch b/fix-linking.patch new file mode 100644 index 0000000..d7a2617 --- /dev/null +++ b/fix-linking.patch @@ -0,0 +1,26 @@ +diff --git a/gview_encoder/CMakeLists.txt b/gview_encoder/CMakeLists.txt +index 8942bae..a39fdaf 100644 +--- a/gview_encoder/CMakeLists.txt ++++ b/gview_encoder/CMakeLists.txt +@@ -24,7 +24,7 @@ set_target_properties( + + pkg_check_modules(FFMPEG REQUIRED libavcodec libavutil) + +-target_link_libraries(gviewencoder ${FFMPEG_LIBRARIES}) ++target_link_libraries(gviewencoder ${FFMPEG_LIBRARIES} m) + add_definitions(${FFMPEG_CFLAGS} ${FFMPEG_CFLAGS_OTHER}) + + include_directories(${CMAKE_SOURCE_DIR}/includes) +diff --git a/gview_v4l2core/CMakeLists.txt b/gview_v4l2core/CMakeLists.txt +index 1ca4aa1..e204238 100644 +--- a/gview_v4l2core/CMakeLists.txt ++++ b/gview_v4l2core/CMakeLists.txt +@@ -31,7 +31,7 @@ set_target_properties( + 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 ${V4L2_LIBRARIES} m) + add_definitions(${V4L2_CFLAGS} ${V4L2_CFLAGS_OTHER}) + + add_compile_definitions(GETTEXT_PACKAGE_V4L2CORE="gview_v4l2core") diff --git a/fix-pkgconfig-path.patch b/fix-pkgconfig-path.patch new file mode 100644 index 0000000..549d885 --- /dev/null +++ b/fix-pkgconfig-path.patch @@ -0,0 +1,52 @@ +diff --git a/gview_audio/CMakeLists.txt b/gview_audio/CMakeLists.txt +index 9714745..3bea235 100644 +--- a/gview_audio/CMakeLists.txt ++++ b/gview_audio/CMakeLists.txt +@@ -42,7 +42,7 @@ if(INSTALL_DEVKIT) + 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() + +diff --git a/gview_encoder/CMakeLists.txt b/gview_encoder/CMakeLists.txt +index a39fdaf..dae9b1f 100644 +--- a/gview_encoder/CMakeLists.txt ++++ b/gview_encoder/CMakeLists.txt +@@ -36,7 +36,7 @@ if(INSTALL_DEVKIT) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libgviewencoder.pc +- DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig ++ DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig + ) + endif() + +diff --git a/gview_render/CMakeLists.txt b/gview_render/CMakeLists.txt +index e63ba39..8cc3e7d 100644 +--- a/gview_render/CMakeLists.txt ++++ b/gview_render/CMakeLists.txt +@@ -53,7 +53,7 @@ if(INSTALL_DEVKIT) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libgviewrender.pc +- DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig ++ DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig + ) + endif() + +diff --git a/gview_v4l2core/CMakeLists.txt b/gview_v4l2core/CMakeLists.txt +index e204238..8eed292 100644 +--- a/gview_v4l2core/CMakeLists.txt ++++ b/gview_v4l2core/CMakeLists.txt +@@ -44,7 +44,7 @@ if(INSTALL_DEVKIT) + 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() + diff --git a/guvcview-SUSE.patch b/guvcview-SUSE.patch deleted file mode 100644 index b4d5445..0000000 --- a/guvcview-SUSE.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Luigi Baldoni -Date: 2017-07-28 17:04:22 +0200 -Subject: SUSE-specific paths - -Change filenames and paths to SUSE standards instead -of messing with them in the .spec file. - -Index: guvcview-src-2.0.8/Makefile.am -=================================================================== ---- guvcview-src-2.0.8.orig/Makefile.am -+++ guvcview-src-2.0.8/Makefile.am -@@ -27,14 +27,6 @@ pkgconfig_DATA = pkgconfig/libgviewv4l2c - - ACLOCAL_AMFLAGS = -I m4 - --docdir = ${datadir}/doc/guvcview --doc_DATA = \ -- README.md\ -- COPYING\ -- AUTHORS\ -- ChangeLog\ -- INSTALL -- - EXTRA_DIST = bootstrap.sh - - check-gettext: -Index: guvcview-src-2.0.8/data/icons/Makefile.am -=================================================================== ---- guvcview-src-2.0.8.orig/data/icons/Makefile.am -+++ guvcview-src-2.0.8/data/icons/Makefile.am -@@ -1,4 +1,4 @@ --iconsdir = ${datadir}/pixmaps/guvcview -+iconsdir = ${datadir}/pixmaps/ - icons_DATA = \ - guvcview.png - diff --git a/guvcview-qt.desktop b/guvcview-qt.desktop new file mode 100644 index 0000000..4bd3729 --- /dev/null +++ b/guvcview-qt.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=guvcview-qt6 +GenericName=Qt UVC video viewer +Comment=A video viewer and capturer for the linux uvc driver +TryExec=guvcview-qt6 +Exec=guvcview-qt6 +Icon=/usr/share/pixmaps/guvcview.png +Terminal=false +Type=Application +Categories=Video;AudioVideo; +StartupNotify=true diff --git a/guvcview-qt5-nolibs_qt5names.patch b/guvcview-qt5-nolibs_qt5names.patch deleted file mode 100644 index 01f62fd..0000000 --- a/guvcview-qt5-nolibs_qt5names.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: Luigi Baldoni -Date: 2017-07-28 17:05:35 +0200 -Subject: Modifications for the -qt5 package - -Don't build libraries and rely on those supplied by the -regular (GTK+) package. -Also change a few filenames to avoid collisions. - -Index: guvcview-src-2.0.8/Makefile.am -=================================================================== ---- guvcview-src-2.0.8.orig/Makefile.am -+++ guvcview-src-2.0.8/Makefile.am -@@ -1,13 +1,8 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = gview_v4l2core \ -- gview_audio \ -- gview_render \ -- gview_encoder \ -- guvcview \ -+SUBDIRS = guvcview \ - data \ -- po \ -- po/gview_v4l2core -+ po - - #Distribute these directories: - DIST_SUBDIRS = gview_v4l2core \ -@@ -19,12 +14,6 @@ DIST_SUBDIRS = gview_v4l2core \ - po \ - po/gview_v4l2core - --pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = pkgconfig/libgviewv4l2core.pc \ -- pkgconfig/libgviewaudio.pc \ -- pkgconfig/libgviewrender.pc \ -- pkgconfig/libgviewencoder.pc -- - ACLOCAL_AMFLAGS = -I m4 - - EXTRA_DIST = bootstrap.sh -Index: guvcview-src-2.0.8/guvcview/Makefile.am -=================================================================== ---- guvcview-src-2.0.8.orig/guvcview/Makefile.am -+++ guvcview-src-2.0.8/guvcview/Makefile.am -@@ -57,14 +57,14 @@ guvcview_CPPFLAGS = $(guvcview_CFLAGS) \ - -fPIC - endif - --guvcview_LDFLAGS = $(LIBINTL) -+guvcview_LDFLAGS = $(LIBINTL) \ -+ $(shell pkg-config --libs libgviewv4l2core) \ -+ $(shell pkg-config --libs libgviewrender) \ -+ $(shell pkg-config --libs libgviewaudio) \ -+ $(shell pkg-config --libs libgviewencoder) - --guvcview_LDADD = ../gview_v4l2core/$(GVIEWV4L2CORE_LIBRARY_NAME).la \ -- ../gview_render/$(GVIEWRENDER_LIBRARY_NAME).la \ -- ../gview_audio/$(GVIEWAUDIO_LIBRARY_NAME).la \ -- ../gview_encoder/$(GVIEWENCODER_LIBRARY_NAME).la \ -- $(PTHREAD_LIBS) \ -- -lm -+guvcview_LDADD = -lpthread \ -+ -lm - if HAVE_GTK3 - guvcview_LDADD += $(GUIGTK3_LIBS) - endif -Index: guvcview-src-2.0.8/configure.ac -=================================================================== ---- guvcview-src-2.0.8.orig/configure.ac -+++ guvcview-src-2.0.8/configure.ac -@@ -73,9 +73,9 @@ GETTEXT_PACKAGE_V4L2CORE=gview_v4l2core - AC_SUBST(GETTEXT_PACKAGE_V4L2CORE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE_V4L2CORE,"$GETTEXT_PACKAGE_V4L2CORE", [gview_v4l2core]) - --GETTEXT_PACKAGE=guvcview -+GETTEXT_PACKAGE=guvcview-qt5 - AC_SUBST(GETTEXT_PACKAGE) --AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [guvcview]) -+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [guvcview-qt5]) - - IT_PROG_INTLTOOL([0.40]) - IT_PO_SUBDIR(po/gview_v4l2core) diff --git a/guvcview-src-2.1.0.tar.bz2 b/guvcview-src-2.1.0.tar.bz2 deleted file mode 100644 index 5762595..0000000 --- a/guvcview-src-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d93e4c9fab8d1a7a9bde1a6dbbf04d6cf9d347c134b5128b4586a1d90b63cfb -size 775670 diff --git a/guvcview-src-2.2.2.tar.bz2 b/guvcview-src-2.2.2.tar.bz2 new file mode 100644 index 0000000..829a9ea --- /dev/null +++ b/guvcview-src-2.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a1b1348b99e79da957a0d9e237395a54757a09db7e0c0809f6c30668b69da3b +size 363756 diff --git a/guvcview.changes b/guvcview.changes index 21c7097..8d36388 100644 --- a/guvcview.changes +++ b/guvcview.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Fri Nov 14 16:55:53 UTC 2025 - Martin Hauke + +- Update to version 2.2.2 + * Apply ffmpeg8 and musl patches by Paul Zander. + * Update to SFML 3.0 . + * Fix some spelling errors. + * Add support for OBSMEET4K. +- Drop patches: + * 0001-fix-deprecation-warning-with-ffpmeg-7.1-add-Wall-to-.patch + * 0002-Fix-desktop-file-for-cmake.patch + +------------------------------------------------------------------- +Wed Nov 12 19:15:51 UTC 2025 - Martin Hauke + +- Add desktop file for guvcview-qt6 + +------------------------------------------------------------------- +Tue Nov 4 14:01:22 UTC 2025 - Martin Hauke + +- Switch to cmake +- Drop multibuild; use a wrapper script instead +- Use %ldconfig_scriptlets +- Update to version 2.2.1 + * Fix encoder video timestamps + * Fix encoder video codec defaults + * Move from qt5 to qt6 + * Change build system from autoconf to cmake + * Add support for yuv420p pixel format for MJPG decoding +- Drop patches (not longer needed): + * 0001-Fix-build-with-GCC-14.patch + * guvcview-SUSE.patch + * guvcview-qt5-nolibs_qt5names.patch + * 0001-Fix-build-with-GCC-14.patch +- Add patches: + * 0001-fix-deprecation-warning-with-ffpmeg-7.1-add-Wall-to-.patch + * 0002-Fix-desktop-file-for-cmake.patch + * fix-linking.patch + * fix-pkgconfig-path.patch + +------------------------------------------------------------------- +Thu Mar 13 18:44:01 UTC 2025 - Jan Engelhardt + +- Use pkgconfig() to be impervious to package renames. + ------------------------------------------------------------------- Tue Aug 27 18:06:06 UTC 2024 - Dave Plater diff --git a/guvcview.spec b/guvcview.spec index 1968735..df3542d 100644 --- a/guvcview.spec +++ b/guvcview.spec @@ -1,7 +1,7 @@ # # spec file for package guvcview # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # Copyright (c) 2012 Malcolm J Lewis # Copyright (c) 2013 Marguerite Su # @@ -18,61 +18,39 @@ # -%define sover0 2_2-2 -%define sover1 2_2-2 -%global flavor @BUILD_FLAVOR@%{nil} - -%define pname guvcview - -%if "%{flavor}" == "qt5" -%bcond_without qt5 -%define psuffix -qt5 -%else -%bcond_with qt5 -%endif - -Name: guvcview%{?psuffix} -Version: 2.1.0 +%define sover 2_2-2 +Name: guvcview +Version: 2.2.2 Release: 0 -# Reference to GPL-2.0 in some files? Summary: GTK+ UVC Viewer and Capturer +# Reference to GPL-2.0 in some files? License: GPL-2.0-or-later Group: Productivity/Multimedia/Video/Players URL: https://guvcview.sourceforge.net/ +#Git-Clone: git://git.code.sf.net/p/guvcview/git-master Source0: https://sourceforge.net/projects/guvcview/files/source/guvcview-src-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE guvcview-SUSE.patch -- use SUSE-specific paths -Patch0: guvcview-SUSE.patch -# PATCH-FIX-OPENSUSE guvcview-qt5-nolibs_qt5names.patch -- use libraries from the GTK+ package -Patch1: guvcview-qt5-nolibs_qt5names.patch -# PATCH-FIX-OPENSUSE 0001-Fix-build-with-GCC-14.patch -- Upstream already has the fix (although part of bigger changeset) -Patch2: 0001-Fix-build-with-GCC-14.patch -BuildRequires: alsa-devel -BuildRequires: automake +Source1: guvcview-qt.desktop +Patch5: fix-linking.patch +Patch6: fix-pkgconfig-path.patch +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: gsl-devel -BuildRequires: gtk3-devel -BuildRequires: intltool BuildRequires: libpng-devel -BuildRequires: libpulse-devel -BuildRequires: libtool -BuildRequires: libusb-1_0-devel -BuildRequires: libv4l-devel BuildRequires: pkgconfig -BuildRequires: portaudio-devel -BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(gsl) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(sdl2) -%if %{with qt5} -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(libgviewaudio) -BuildRequires: pkgconfig(libgviewencoder) -BuildRequires: pkgconfig(libgviewrender) -BuildRequires: pkgconfig(libgviewv4l2core) -%endif Recommends: %{name}-lang %description @@ -80,39 +58,39 @@ A GTK interface for capturing and viewing video from devices supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. -%package -n libgviewaudio-%{sover0} +%package -n libgviewaudio-%{sover} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries -%description -n libgviewaudio-%{sover0} +%description -n libgviewaudio-%{sover} A GTK interface for capturing and viewing video from devices supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. -%package -n libgviewencoder-%{sover1} +%package -n libgviewencoder-%{sover} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries -%description -n libgviewencoder-%{sover1} +%description -n libgviewencoder-%{sover} A GTK interface for capturing and viewing video from devices supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. -%package -n libgviewrender-%{sover1} +%package -n libgviewrender-%{sover} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries -%description -n libgviewrender-%{sover1} +%description -n libgviewrender-%{sover} A GTK interface for capturing and viewing video from devices supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. -%package -n libgviewv4l2core-%{sover1} +%package -n libgviewv4l2core-%{sover} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries Recommends: libgviewv4l2core-lang -%description -n libgviewv4l2core-%{sover1} +%description -n libgviewv4l2core-%{sover} A GTK interface for capturing and viewing video from devices supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. @@ -120,22 +98,22 @@ any v4l2 compatible device. %package devel Summary: Development files for guvcview Group: Development/Libraries/C and C++ -Requires: alsa-devel Requires: glibc-devel -Requires: gsl-devel -Requires: libSDL2-devel -Requires: libgviewaudio-%{sover0} = %{version}-%{release} -Requires: libgviewencoder-%{sover1} = %{version}-%{release} -Requires: libgviewrender-%{sover1} = %{version}-%{release} -Requires: libgviewv4l2core-%{sover1} = %{version}-%{release} +Requires: libgviewaudio-%{sover} = %{version}-%{release} +Requires: libgviewencoder-%{sover} = %{version}-%{release} +Requires: libgviewrender-%{sover} = %{version}-%{release} +Requires: libgviewv4l2core-%{sover} = %{version}-%{release} Requires: libpng-devel -Requires: libpulse-devel -Requires: libudev-devel -Requires: libusb-1_0-devel -Requires: libv4l-devel -Requires: portaudio-devel +Requires: pkgconfig(alsa) +Requires: pkgconfig(gsl) Requires: pkgconfig(libavcodec) Requires: pkgconfig(libavutil) +Requires: pkgconfig(libpulse) +Requires: pkgconfig(libudev) +Requires: pkgconfig(libusb-1.0) +Requires: pkgconfig(libv4l2) +Requires: pkgconfig(portaudio-2.0) +Requires: pkgconfig(sdl2) %description devel A GTK interface for capturing and viewing video from devices @@ -150,94 +128,70 @@ applications that want to make use of the GUVC libraries. %package -n libgviewv4l2core-lang Summary: Languages for libgviewv4l2core Group: System/Localization -Requires: libgviewv4l2core-%{sover1} = %{version} +Requires: libgviewv4l2core-%{sover} = %{version} Provides: libgviewv4l2core-lang-all = %{version} -Supplements: (bundle-lang-other and libgviewv4l2core-%{sover1}) +Supplements: (bundle-lang-other and libgviewv4l2core-%{sover}) BuildArch: noarch %description -n libgviewv4l2core-lang Provides translations to libgviewv4l2core. %prep -%setup -q -n %{pname}-src-%{version} -%patch -P 0 -p1 -%patch -P 2 -p1 -%if %{with qt5} -%patch -P 1 -p1 -%endif +%autosetup -p1 -n %{name}-src-%{version} %build -# autoconf is too old in Leap -%if 0%{?suse_version} == 1500 -sed -i '/AC_CHECK_INCLUDES_DEFAULT/d' configure.ac -%endif - -autoreconf -fiv -%configure --disable-debian-menu \ - --disable-desktop \ -%if %{with qt5} - --disable-gtk3 \ - --enable-qt5 \ - --program-suffix=-qt5 \ -%endif -%{nil} -%make_build +%cmake \ + -DUSE_GTK3=ON \ + -DUSE_QT6=ON \ + -DUSE_SDL2=ON \ + -DINSTALL_DEVKIT=ON +%make_jobs %install -%make_install -# Create desktop file as disabled during build -%suse_update_desktop_file -c %{name} "A video viewer and capturer for the linux uvc driver" %{name} %{name} %{name} AudioVideo AudioVideoEditing +%cmake_install + +# wrapper for guvcview-qt6 +echo -e "#!/bin/sh\nexec %{_bindir}/guvcview --gui=qt6 \"\$@\"" > %{buildroot}%{_bindir}/guvcview-qt6 +chmod 755 %{buildroot}%{_bindir}/guvcview-qt6 + +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}-qt6.desktop + %find_lang %{name} %{?no_lang_C} - -%if %{with qt5} -mv %{buildroot}%{_datadir}/pixmaps/%{pname}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png -%else %find_lang gview_v4l2core libgviewv4l2core.lang %{?no_lang_C} -%endif -%fdupes %{buildroot} - -%if ! %{with qt5} -rm %{buildroot}%{_libdir}/*.{la,a} - -%ldconfig_scriptlets -n libgviewaudio-%{sover0} -%ldconfig_scriptlets -n libgviewencoder-%{sover1} -%ldconfig_scriptlets -n libgviewrender-%{sover1} -%ldconfig_scriptlets -n libgviewv4l2core-%{sover1} -%endif +%ldconfig_scriptlets -n libgviewaudio-%{sover} +%ldconfig_scriptlets -n libgviewencoder-%{sover} +%ldconfig_scriptlets -n libgviewrender-%{sover} +%ldconfig_scriptlets -n libgviewv4l2core-%{sover} %files %license COPYING %doc AUTHORS ChangeLog README.md %{_bindir}/%{name} +%{_bindir}/%{name}-qt6 %{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/%{name}-qt6.desktop +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/%{name}.1%{?ext_man} -%if ! %{with qt5} -%files -n libgviewaudio-%{sover0} -%{_libdir}/libgviewaudio-*.so.* +%files -n libgviewaudio-%{sover} +%{_libdir}/libgviewaudio.so.* -%files -n libgviewencoder-%{sover1} -%{_libdir}/libgviewencoder-*.so.* +%files -n libgviewencoder-%{sover} +%{_libdir}/libgviewencoder.so.* -%files -n libgviewrender-%{sover1} -%{_libdir}/libgviewrender-*.so.* +%files -n libgviewrender-%{sover} +%{_libdir}/libgviewrender.so.* -%files -n libgviewv4l2core-%{sover1} -%{_libdir}/libgviewv4l2core-*.so.* +%files -n libgviewv4l2core-%{sover} +%{_libdir}/libgviewv4l2core.so.* %files devel -%dir %{_includedir}/guvcview-2 -%dir %{_includedir}/guvcview-2/libgviewaudio -%dir %{_includedir}/guvcview-2/libgviewencoder -%dir %{_includedir}/guvcview-2/libgviewrender -%dir %{_includedir}/guvcview-2/libgviewv4l2core -%{_includedir}/guvcview-2/libgviewaudio/gviewaudio.h -%{_includedir}/guvcview-2/libgviewencoder/gviewencoder.h -%{_includedir}/guvcview-2/libgviewrender/gviewrender.h -%{_includedir}/guvcview-2/libgviewv4l2core/gview.h -%{_includedir}/guvcview-2/libgviewv4l2core/gviewv4l2core.h +%{_includedir}/gviewaudio.h +%{_includedir}/gviewencoder.h +%{_includedir}/gviewrender.h +%{_includedir}/gviewv4l2core.h %{_libdir}/libgviewaudio.so %{_libdir}/libgviewencoder.so %{_libdir}/libgviewrender.so @@ -248,7 +202,6 @@ rm %{buildroot}%{_libdir}/*.{la,a} %{_libdir}/pkgconfig/libgviewv4l2core.pc %files -n libgviewv4l2core-lang -f libgviewv4l2core.lang -%endif %files lang -f %{name}.lang