Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package guvcview for openSUSE:Factory checked in at 2022-08-11 18:32:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guvcview (Old) and /work/SRC/openSUSE:Factory/.guvcview.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guvcview" Thu Aug 11 18:32:37 2022 rev:7 rq:994459 version:2.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/guvcview/guvcview.changes 2020-02-04 19:53:42.721334154 +0100 +++ /work/SRC/openSUSE:Factory/.guvcview.new.1521/guvcview.changes 2022-08-11 18:32:54.954234842 +0200 @@ -1,0 +2,21 @@ +Mon Aug 8 22:06:07 UTC 2022 - Atri Bhattacharya <[email protected]> + +- Update to version 2.0.8: + * Fix libav API break (ticket #70) + * Update autoconf scripts + * Support for building against ffmpeg5. +- Changes from version 2.0.7: + * Fix audio encoder (tickets #64 and #65) + * Use current theme icons (get icon by name) +- Convert to multibuild with qt5 as additional flavor: + * Drop guvcview-qt5.spec, guvcview-qt5.changes, pre_checkin.sh + script. + * Drop hunks from guvcview-qt5-nolibs_qt5names.patch duplicated + in guvcview-SUSE.patch. + * Adapt BuildRequires for the additional flavour appropriately. +- Update so versions in keeping with upstream shlib versioning. +- Replace packageand type Supplements with RPM binary Supplements. +- Update guvcview-SUSE.patch to drop icon dir restructuring: no + longer needed after all theme-able application icons dropped. + +------------------------------------------------------------------- Old: ---- guvcview-qt5.changes guvcview-qt5.spec guvcview-src-2.0.6.tar.gz pre_checkin.sh New: ---- _multibuild guvcview-src-2.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guvcview.spec ++++++ --- /var/tmp/diff_new_pack.NK4G64/_old 2022-08-11 18:32:55.418234130 +0200 +++ /var/tmp/diff_new_pack.NK4G64/_new 2022-08-11 18:32:55.426234117 +0200 @@ -1,7 +1,7 @@ # -# spec file for package guvcview +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2012 Malcolm J Lewis <[email protected]> # Copyright (c) 2013 Marguerite Su <[email protected]> # @@ -18,20 +18,32 @@ # -%define sover 2_0-2 +%define sover0 2_0-2 +%define sover1 2_1-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 -Version: 2.0.6 +Name: guvcview%{?psuffix} +Version: 2.0.8 Release: 0 # Reference to GPL-2.0 in some files? Summary: GTK+ UVC Viewer and Capturer License: GPL-3.0-only Group: Productivity/Multimedia/Video/Players URL: http://guvcview.sourceforge.net/ -Source0: https://sourceforge.net/projects/guvcview/files/source/guvcview-src-%{version}.tar.gz -Source90: pre_checkin.sh +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 BuildRequires: alsa-devel BuildRequires: automake BuildRequires: fdupes @@ -52,6 +64,13 @@ BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libudev) 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,39 +79,39 @@ supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. -%package -n libgviewaudio-%{sover} +%package -n libgviewaudio-%{sover0} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries -%description -n libgviewaudio-%{sover} +%description -n libgviewaudio-%{sover0} 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-%{sover} +%package -n libgviewencoder-%{sover1} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries -%description -n libgviewencoder-%{sover} +%description -n libgviewencoder-%{sover1} 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-%{sover} +%package -n libgviewrender-%{sover1} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries -%description -n libgviewrender-%{sover} +%description -n libgviewrender-%{sover1} 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-%{sover} +%package -n libgviewv4l2core-%{sover1} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries Recommends: libgviewv4l2core-lang -%description -n libgviewv4l2core-%{sover} +%description -n libgviewv4l2core-%{sover1} 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. @@ -104,10 +123,10 @@ Requires: glibc-devel Requires: gsl-devel Requires: libSDL2-devel -Requires: libgviewaudio-%{sover} = %{version}-%{release} -Requires: libgviewencoder-%{sover} = %{version}-%{release} -Requires: libgviewrender-%{sover} = %{version}-%{release} -Requires: libgviewv4l2core-%{sover} = %{version}-%{release} +Requires: libgviewaudio-%{sover0} = %{version}-%{release} +Requires: libgviewencoder-%{sover1} = %{version}-%{release} +Requires: libgviewrender-%{sover1} = %{version}-%{release} +Requires: libgviewv4l2core-%{sover1} = %{version}-%{release} Requires: libpng-devel Requires: libpulse-devel Requires: libudev-devel @@ -130,70 +149,86 @@ %package -n libgviewv4l2core-lang Summary: Languages for libgviewv4l2core Group: System/Localization -Requires: libgviewv4l2core-%{sover} = %{version} +Requires: libgviewv4l2core-%{sover1} = %{version} Provides: libgviewv4l2core-lang-all = %{version} -Supplements: packageand(bundle-lang-other:libgviewv4l2core-%{sover}) +Supplements: (bundle-lang-other and libgviewv4l2core-%{sover1}) BuildArch: noarch %description -n libgviewv4l2core-lang Provides translations to libgviewv4l2core. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n %{pname}-src-%{version} %patch0 -p1 +%if %{with qt5} +%patch1 -p1 +%endif %build autoreconf -fiv %configure --disable-debian-menu \ - --disable-desktop -make %{?_smp_mflags} + --disable-desktop \ +%if %{with qt5} + --disable-gtk3 \ + --enable-qt5 \ + --program-suffix=-qt5 \ +%endif +%{nil} +%make_build %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 + %fdupes %{buildroot} rm -f %{buildroot}%{_libdir}/*.{la,a} -%post -n libgviewaudio-%{sover} -p /sbin/ldconfig -%postun -n libgviewaudio-%{sover} -p /sbin/ldconfig - -%post -n libgviewencoder-%{sover} -p /sbin/ldconfig -%postun -n libgviewencoder-%{sover} -p /sbin/ldconfig - -%post -n libgviewrender-%{sover} -p /sbin/ldconfig -%postun -n libgviewrender-%{sover} -p /sbin/ldconfig - -%post -n libgviewv4l2core-%{sover} -p /sbin/ldconfig -%postun -n libgviewv4l2core-%{sover} -p /sbin/ldconfig +%if ! %{with qt5} +%post -n libgviewaudio-%{sover0} -p /sbin/ldconfig +%postun -n libgviewaudio-%{sover0} -p /sbin/ldconfig + +%post -n libgviewencoder-%{sover1} -p /sbin/ldconfig +%postun -n libgviewencoder-%{sover1} -p /sbin/ldconfig + +%post -n libgviewrender-%{sover1} -p /sbin/ldconfig +%postun -n libgviewrender-%{sover1} -p /sbin/ldconfig + +%post -n libgviewv4l2core-%{sover1} -p /sbin/ldconfig +%postun -n libgviewv4l2core-%{sover1} -p /sbin/ldconfig +%endif %files %defattr(-,root,root) %license COPYING %doc AUTHORS ChangeLog README.md %{_bindir}/%{name} -%dir %{_datadir}/pixmaps/%{name} -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/pixmaps/%{name}/*.png %{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/*.gz +%{_datadir}/pixmaps/%{name}.png +%{_mandir}/man1/%{name}.1%{ext_man} -%files -n libgviewaudio-%{sover} +%if ! %{with qt5} +%files -n libgviewaudio-%{sover0} %defattr(-,root,root) %{_libdir}/libgviewaudio-*.so.* -%files -n libgviewencoder-%{sover} +%files -n libgviewencoder-%{sover1} %defattr(-,root,root) %{_libdir}/libgviewencoder-*.so.* -%files -n libgviewrender-%{sover} +%files -n libgviewrender-%{sover1} %defattr(-,root,root) %{_libdir}/libgviewrender-*.so.* -%files -n libgviewv4l2core-%{sover} +%files -n libgviewv4l2core-%{sover1} %defattr(-,root,root) %{_libdir}/libgviewv4l2core-*.so.* @@ -218,8 +253,9 @@ %{_libdir}/pkgconfig/libgviewrender.pc %{_libdir}/pkgconfig/libgviewv4l2core.pc -%files lang -f %{name}.lang - %files -n libgviewv4l2core-lang -f libgviewv4l2core.lang +%endif + +%files lang -f %{name}.lang %changelog ++++++ _multibuild ++++++ <multibuild> <package>qt5</package> </multibuild> ++++++ guvcview-SUSE.patch ++++++ --- /var/tmp/diff_new_pack.NK4G64/_old 2022-08-11 18:32:55.470234050 +0200 +++ /var/tmp/diff_new_pack.NK4G64/_new 2022-08-11 18:32:55.474234044 +0200 @@ -5,36 +5,10 @@ Change filenames and paths to SUSE standards instead of messing with them in the .spec file. -Index: guvcview-src-2.0.5/data/icons/Makefile.am +Index: guvcview-src-2.0.8/Makefile.am =================================================================== ---- guvcview-src-2.0.5.orig/data/icons/Makefile.am -+++ guvcview-src-2.0.5/data/icons/Makefile.am -@@ -1,6 +1,6 @@ - iconsdir = ${datadir}/pixmaps/guvcview -+appicondir = ${datadir}/pixmaps - icons_DATA = \ -- guvcview.png\ - camera.png\ - movie.png\ - image_controls.png\ -@@ -8,6 +8,7 @@ icons_DATA = \ - audio_controls.png\ - close.png - -+appicon_DATA = guvcview.png - - gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/pixmaps/guvcview/ - -@@ -22,4 +23,4 @@ update-icon-cache: - echo "*** $(gtk_update_icon_cache)"; \ - fi - --EXTRA_DIST = $(icons_DATA) -+EXTRA_DIST = $(icons_DATA) $(appicon_DATA) -Index: guvcview-src-2.0.5/Makefile.am -=================================================================== ---- guvcview-src-2.0.5.orig/Makefile.am -+++ guvcview-src-2.0.5/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 @@ -50,4 +24,14 @@ 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 + ++++++ guvcview-qt5-nolibs_qt5names.patch ++++++ --- /var/tmp/diff_new_pack.NK4G64/_old 2022-08-11 18:32:55.490234019 +0200 +++ /var/tmp/diff_new_pack.NK4G64/_new 2022-08-11 18:32:55.494234013 +0200 @@ -6,10 +6,10 @@ regular (GTK+) package. Also change a few filenames to avoid collisions. -Index: guvcview-src-2.0.6/Makefile.am +Index: guvcview-src-2.0.8/Makefile.am =================================================================== ---- guvcview-src-2.0.6.orig/Makefile.am -+++ guvcview-src-2.0.6/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 @@ -39,10 +39,10 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = bootstrap.sh -Index: guvcview-src-2.0.6/guvcview/Makefile.am +Index: guvcview-src-2.0.8/guvcview/Makefile.am =================================================================== ---- guvcview-src-2.0.6.orig/guvcview/Makefile.am -+++ guvcview-src-2.0.6/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 @@ -65,30 +65,10 @@ if HAVE_GTK3 guvcview_LDADD += $(GUIGTK3_LIBS) endif -Index: guvcview-src-2.0.6/data/icons/Makefile.am +Index: guvcview-src-2.0.8/configure.ac =================================================================== ---- guvcview-src-2.0.6.orig/data/icons/Makefile.am -+++ guvcview-src-2.0.6/data/icons/Makefile.am -@@ -1,4 +1,4 @@ --iconsdir = ${datadir}/pixmaps/guvcview -+iconsdir = ${datadir}/pixmaps/guvcview-qt5 - appicondir = ${datadir}/pixmaps - icons_DATA = \ - camera.png\ -@@ -12,7 +12,8 @@ appicon_DATA = guvcview.png - - gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/pixmaps/guvcview/ - --install-data-hook: update-icon-cache -+install-data-hook: -+ mv $(DESTDIR)/$(appicondir)/guvcview.png $(DESTDIR)/$(appicondir)/guvcview-qt5.png - uninstall-hook: update-icon-cache - update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ -Index: guvcview-src-2.0.6/configure.ac -=================================================================== ---- guvcview-src-2.0.6.orig/configure.ac -+++ guvcview-src-2.0.6/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]) ++++++ guvcview-src-2.0.6.tar.gz -> guvcview-src-2.0.8.tar.bz2 ++++++ ++++ 28946 lines of diff (skipped)
