Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package guvcview for openSUSE:Factory checked in at 2025-11-10 19:21:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guvcview (Old) and /work/SRC/openSUSE:Factory/.guvcview.new.1980 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guvcview" Mon Nov 10 19:21:29 2025 rev:11 rq:1316936 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/guvcview/guvcview.changes 2025-03-16 18:59:38.355111434 +0100 +++ /work/SRC/openSUSE:Factory/.guvcview.new.1980/guvcview.changes 2025-11-10 19:22:02.156163223 +0100 @@ -1,0 +2,23 @@ +Tue Nov 4 14:01:22 UTC 2025 - Martin Hauke <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-Fix-build-with-GCC-14.patch _multibuild guvcview-SUSE.patch guvcview-qt5-nolibs_qt5names.patch guvcview-src-2.1.0.tar.bz2 New: ---- 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 guvcview-src-2.2.1.tar.bz2 ----------(Old B)---------- Old:- Drop patches (not longer needed): * 0001-Fix-build-with-GCC-14.patch * guvcview-SUSE.patch Old: * 0001-Fix-build-with-GCC-14.patch * guvcview-SUSE.patch * guvcview-qt5-nolibs_qt5names.patch Old: * guvcview-SUSE.patch * guvcview-qt5-nolibs_qt5names.patch * 0001-Fix-build-with-GCC-14.patch ----------(Old E)---------- ----------(New B)---------- New:- Add patches: * 0001-fix-deprecation-warning-with-ffpmeg-7.1-add-Wall-to-.patch * 0002-Fix-desktop-file-for-cmake.patch New: * 0001-fix-deprecation-warning-with-ffpmeg-7.1-add-Wall-to-.patch * 0002-Fix-desktop-file-for-cmake.patch * fix-linking.patch New: * 0002-Fix-desktop-file-for-cmake.patch * fix-linking.patch * fix-pkgconfig-path.patch New: * fix-linking.patch * fix-pkgconfig-path.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guvcview.spec ++++++ --- /var/tmp/diff_new_pack.6Hqe9c/_old 2025-11-10 19:22:02.880193620 +0100 +++ /var/tmp/diff_new_pack.6Hqe9c/_new 2025-11-10 19:22:02.884193788 +0100 @@ -1,7 +1,7 @@ # # spec file for package guvcview # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # Copyright (c) 2012 Malcolm J Lewis <[email protected]> # Copyright (c) 2013 Marguerite Su <[email protected]> # @@ -18,61 +18,43 @@ # -%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.1 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: automake +Patch3: 0001-fix-deprecation-warning-with-ffpmeg-7.1-add-Wall-to-.patch +Patch4: 0002-Fix-desktop-file-for-cmake.patch +Patch5: fix-linking.patch +Patch6: fix-pkgconfig-path.patch +# +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: intltool BuildRequires: libpng-devel -BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavutil) +# use ffmpeg7 +BuildRequires: ffmpeg-7-libavcodec-devel +BuildRequires: ffmpeg-7-libavutil-devel +# BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Widgets) 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 +62,39 @@ 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. @@ -121,10 +103,10 @@ Summary: Development files for guvcview Group: Development/Libraries/C and C++ Requires: glibc-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: pkgconfig(alsa) Requires: pkgconfig(gsl) @@ -150,94 +132,67 @@ %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 -%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 +%cmake_install -%fdupes %{buildroot} +# wrapper for guvcview-qt6 +echo -e "#!/bin/sh\nexec %{_bindir}/guvcview --gui=qt6 \"\$@\"" > %{buildroot}%{_bindir}/guvcview-qt6 +chmod 755 %{buildroot}%{_bindir}/guvcview-qt6 -%if ! %{with qt5} -rm %{buildroot}%{_libdir}/*.{la,a} +%find_lang %{name} %{?no_lang_C} +%find_lang gview_v4l2core libgviewv4l2core.lang %{?no_lang_C} -%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}/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 +203,6 @@ %{_libdir}/pkgconfig/libgviewv4l2core.pc %files -n libgviewv4l2core-lang -f libgviewv4l2core.lang -%endif %files lang -f %{name}.lang ++++++ 0001-fix-deprecation-warning-with-ffpmeg-7.1-add-Wall-to-.patch ++++++ ++++ 1501 lines (skipped) ++++++ 0002-Fix-desktop-file-for-cmake.patch ++++++ >From 39f76eda4d66ef7b2303ce795e701e43fafadff2 Mon Sep 17 00:00:00 2001 From: Paulo Assis <[email protected]> Date: Mon, 2 Dec 2024 14:19:01 +0000 Subject: [PATCH 2/2] Fix desktop file for cmake --- data/guvcview.desktop.in | 64 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/data/guvcview.desktop.in b/data/guvcview.desktop.in index c086c21..ca02856 100644 --- a/data/guvcview.desktop.in +++ b/data/guvcview.desktop.in @@ -1,8 +1,64 @@ [Desktop Entry] -_Name=guvcview -_GenericName=GTK UVC video viewer -_X-GNOME-FullName=GTK UVC video viewer -_Comment=A video viewer and capturer for the linux uvc driver +Name=guvcview +Name[cs]=guvcview +Name[de]=GUVCView +Name[en_AU]=guvcview +Name[es]=guvcview +Name[fr]=guvcview +Name[it]=guvcview +Name[lv]=guvcview +Name[nl]=guvcview +Name[pt]=guvcview +Name[pt_BR]=guvcview +Name[ru]=guvcview +Name[si]=guvcview +Name[sr]=Камерица +Name[tr]=guvcview +GenericName=GTK UVC video viewer +GenericName[cs]=Prohlížeč videa GTK UVC +GenericName[de]=UVC-Video-Betrachter in GTK +GenericName[en_AU]=GTK UVC video viewer +GenericName[es]=Visualizador GTK de vídeo UVC +GenericName[fr]=Logiciel GTK de visualisation de vidéo UVC +GenericName[it]=GTK UVC visualizzatore video +GenericName[lv]=GTK UVC video skatītājs +GenericName[nl]=GTK UVC videokijker +GenericName[pt]=Visualizador de vídeo GTK UVC +GenericName[pt_BR]=Visualizador de vídeo GTK UVC +GenericName[ru]=GTK UVC видео обозреватель +GenericName[si]=GTK UVC වීඩියෝ දකින්නා +GenericName[sr]=ГТК УВЦ видео приказивач +GenericName[tr]=GTK UVC video görüntüleyici +X-GNOME-FullName=GTK UVC video viewer +X-GNOME-FullName[cs]=Prohlížeč videa GTK UVC +X-GNOME-FullName[de]=UVC-Video-Betrachter in GTK +X-GNOME-FullName[en_AU]=GTK UVC video viewer +X-GNOME-FullName[es]=Visualizador GTK de vídeo UVC +X-GNOME-FullName[fr]=Logiciel GTK de visualisation de vidéo UVC +X-GNOME-FullName[it]=GTK UVC visualizzatore video +X-GNOME-FullName[lv]=GTK UVC video skatītājs +X-GNOME-FullName[nl]=GTK UVC videokijker +X-GNOME-FullName[pt]=Visualizador de vídeo GTK UVC +X-GNOME-FullName[pt_BR]=Visualizador de vídeo GTK UVC +X-GNOME-FullName[ru]=GTK UVC видео обозреватель +X-GNOME-FullName[si]=GTK UVC වීඩියෝ දකින්නා +X-GNOME-FullName[sr]=ГТК УВЦ видео приказивач +X-GNOME-FullName[tr]=GTK UVC video görüntüleyici +Comment=A video viewer and capturer for the linux uvc driver +Comment[cs]=Prohlížení a zachytávání videa z linuxových uvc ovladačů +Comment[de]=Ein Video-Betrachter und Aufnahmewerkzeug für den Linux-UVC-Treiber +Comment[en_AU]=A video viewer and capturer for the linux uvc driver +Comment[es]=Un visualizador y capturador de vídeo para el controlador UVC de Linux +Comment[fr]=Logiciel de visualisation et de capture vidéo pour le pilote uvc Linux +Comment[it]=Un visualizzatore e catturatore video per il driver uvc di linux +Comment[lv]=Video skatītājs un uzņēmējs Linux UVC draiverim +Comment[nl]=Een programma voor het bekijken en opnemen van video, voor het Linuxstuurprogramma uvc +Comment[pt]=Um visualizador e capturador de de vídeo para o controlador linux uvc +Comment[pt_BR]=Um visualizador e capturador de de vídeo para o controlador linux uvc +Comment[ru]=Программа просмотра и записи видео для драйвера Linux UVC +Comment[si]=ලිනක්ස් uvc ඩ්රයිවරය සඳහා වීඩියෝ පෙන්වන්නා සහ ග්රහණය කරන්නා +Comment[sr]=Приказивач и снимач видеа за линуксов увц управљачки програм +Comment[tr]=Linux uvc sürücüsü için video görüntüleyici ve yakalayıcı TryExec=guvcview Exec=guvcview Icon=@DATADIR@/pixmaps/guvcview.png -- 2.51.1 ++++++ fix-linking.patch ++++++ 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") ++++++ fix-pkgconfig-path.patch ++++++ 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() ++++++ guvcview-src-2.1.0.tar.bz2 -> guvcview-src-2.2.1.tar.bz2 ++++++ ++++ 236900 lines of diff (skipped)
