Hello community, here is the log from the commit of package guvcview for openSUSE:Factory checked in at 2017-08-21 11:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guvcview (Old) and /work/SRC/openSUSE:Factory/.guvcview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guvcview" Mon Aug 21 11:36:03 2017 rev:2 rq:513017 version:2.0.5 Changes: -------- New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.guvcview.new/guvcview-qt5.changes 2017-08-21 11:36:20.128141880 +0200 @@ -0,0 +1,222 @@ +------------------------------------------------------------------- +Sat Jul 29 10:53:31 UTC 2017 - aloi...@gmx.com + +- Update to version 2.0.5 + * terminate configure if qt5 is enabled and moc is missing + * add sfml render + * fix aac encoder (replace experimental aac by libvo_aacenc) + * fix build against newer kernels + * disable window key pressed events if a string control has focus + * fix video monotonic pts flag value in encoder context + * fix audio cleanup + * add support for HEVC (h265) video codec + * fix muxed h264 support; fix raw output (alloc outbuf frame) + * add circular buffer for delayed audio frames pts + * remove support for older libavcodec versions (< 54.01) + * add support for VP9 + * fix motion estimation method for x264 [1-4] + * fix buggy behaviour for file names without extension + * add support for sfml render + * drop support for sdl1 based render + * Flavio Spagnuolo <flavio.spagnu...@gmail.com>: fix matroska + clean up when audio is disabled + * fix segfault when destroying mutexes by unlocking already + unlocked mutexes + * fix libc readdir_r deprecated warning: replace by readdir + * add extra video fx filters + +- Dropped guvcview-2.0.4_ffmpeg-3.0.patch (merged upstream) + +- Split lang package contents between guvcview-lang and a new + libgviewv4l2core-lang + +- Added separate -qt5 and -qt5-lang packages and pre_checkin.sh + and guvcview-qt5-nolibs_qt5names.patch to support them + +- Added guvcview-qt5-ppc64_QVariant.patch to fix build on ppc64 + +- Replaced some in-spec commands with guvcview-SUSE.patch + +------------------------------------------------------------------- +Thu Mar 2 10:28:49 UTC 2017 - jeng...@inai.de + +- Rename %soname to %sover to better reflect its use +- Ensure description neutrality + +------------------------------------------------------------------- +Sun May 1 18:06:05 UTC 2016 - aloi...@gmx.com + +- Update to version 2.0.4: + * drop support for internal 422 packed format (use only 420 planar) + * add support for extra pixel formats, including be formats + * add command line option for requesting fps + * add support for control events + * add support for string, int64, bitmask and integer menu controls + * make sure we can't select unsuported pix formats from the gui + * fix status message for QT5 interface + * move mutexes to device handlers (context) + * v4l2core and audio api - don't access device data directly (use opaque structures) + * add constructor and destructor functions for v4l2core and encoder + Paulo Assis <pj.as...@gmail.com> Mon, 22 Feb 2016 10:10:00 +0100 + 2.0.3: + * Add Qt5 interface (--enable-qt5) + * fix '-n' option (don't save frame when photo countdown reaches 0) + * restore exit_on_term option + * use AC_SYS_LARGEFILE m4 macro for enabling Large File Support (LFS) on 32 bit systems + * add color config for crosshair osd + * change rendering engine to use updateTexture instead of lock/unlock texture + * change rendering lib to avoid frame copy when using osd + Paulo Assis <pj.as...@gmail.com> Mon, 4 Jan 2016 23:34:00 +0100 + +- Dropped guvcview-implicit-pointer-decl.patch + guvcview-no-return-in-nonvoid-function.patch + guvcview-voidreturn.patch + +- Added guvcview-2.0.4_ffmpeg-3.0.patch + +------------------------------------------------------------------- +Tue Sep 22 08:47:31 UTC 2015 - o...@aepfle.de + +- Use pkgconfig for ffmpeg BuildRequires + +------------------------------------------------------------------- +Wed Aug 05 10:49:17 UTC 2015 - joerg.loren...@ki.tng.de + +- Update to version 2.0.2: + + fix mjpeg and h264 decoders (libav): init avpacket. + + fix wrong logic of enable switches (Marvin Schmidt ticket #12). + + create a frame queue and refactor frame grab/decode. + + fix jpeg decoder for older libavcodec api ( < 54.25). + + attach video capture to SIGUSR1 signal. + + add audio latency control to gui. + + change default portaudio latency to high latency. + + set device during initialization. + + use time for matroska segment uid if gsl is disabled. + + fix array index causing buffer overflow. + + restore CPPFLAGS after AC_CHECK_HEADERS. + + remove direct access to device data in v4l2core lib. + + make sure to stop encoder thread before exiting capture thread. + + avoid SIGFPE on bad channels or samprate data inside audio + capture callbacks. + + remove check for avcodec.h (it's needed for very old libavcodec + versions); set iyuv as default internal format (over yuyv). + + add basic support for continuous and stepwise frame sizes. + + add support for empty control list. + + add code for crossair osd. + + fix h264 demux from mjpg container. + + fix pan/tilt for logitech peripheral V3 (use raw control + instead of v4l2). + +------------------------------------------------------------------- +Fri Oct 31 11:53:42 UTC 2014 - joerg.loren...@ki.tng.de + +- Update to version 2.0.1: + + Fix audio clean bug (segfault when audio=none). + + Add --disable_libv4l2 option. + + Add support for internal yu12 planar format. + + Workaround uvcvideo bug (buf.bytesused=0 on kernels >=3.16). +- Changes since version 2.0.0: + + New version 2.0.0 (code rewriten from scratch). + + Move all core functions to 4 shared libs. + + Change options. + + Change config. + + Add sdl2 render. + + Use gsl for random number generation. +- Changes since version 1.7.3: + + Add silence frames to compensate audio drift (delay). + + Fix possible memory leak. + + Add video and image capture through system signals: + SIGUSR1 and SIGUSR2. + + Add true no_display mode (no X required). + + Small bug fixes. +- Changes since version 1.7.2: + + Add H264 decoding support. + + Sync translations. +- Changes since version 1.7.1: + + Fix avi muxer: fix opendml indexes (>= 1Gb). + + Update Italian translation. + +------------------------------------------------------------------- +Tue Jul 30 13:34:46 UTC 2013 - i...@margueirte.su + +- build against libffmpeg-devel. + +------------------------------------------------------------------- +Sat Jul 20 20:41:27 UTC 2013 - zai...@opensuse.org + +- Update to version 1.7.0: + + Refactor avi muxer (base it on libav muxer with opendml + support). + + Refactor mkv muxer (base it on libav muxer with webm support). + + Add VP8, Theora and Vorbis codecs. + + Add Webm support. + + Add a Top Menu. + + Move all file operations to the Top Menu. + +------------------------------------------------------------------- +Fri Sep 20 12:27:00 UTC 2012 - zai...@opensuse.org + +- Update to version 1.6.1: + + Fix build with latest libavcodec. + + Fix audio codecs listing. + + Fix audio codecs (AC3 and AAC) input format for latest + libavcodec API (float). + + Add support for delayed frames in video encoding. +- Changes since version 1.6.0: + + Run audio in separate thread. + + Update audio buffer. + + Move pulse audio interface from simple to async API. + + Add pulse device list. + + Enable build of pulse API by default. +- Added new build dependency, intltool. + +------------------------------------------------------------------- +Sun May 20 14:28:10 UTC 2012 - zai...@opensuse.org + +- Update to version 1.5.3: + + Update libavcodec API. + + Add libavutil dependency. + + Fix pulse interface. + + Update language catalogs. +- Drop guvcview-pulseaudio-fix.patch, fixed upstream. +- Change BuildRequires: pulseaudio-devel to libpulse-devel. + +------------------------------------------------------------------- +Sun Feb 26 15:52:45 UTC 2012 - zai...@opensuse.org + +- Update to version 1.5.2: + + Move to pthreads (fix gthread API 2 issues). + + Add italian translation. + + Fix several libavcodec issues. + + Fix some gtk3 widgets. +- Drop guvcview-fix-glib-include.patch, fixed upstream. +- Add guvcview-pulseaudio-fix.patch: Fix pulseaudio interface. + +------------------------------------------------------------------- +Mon Jan 23 00:48:09 UTC 2012 - malcolmle...@opensuse.org + ++++ 25 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.guvcview.new/guvcview-qt5.changes --- /work/SRC/openSUSE:Factory/guvcview/guvcview.changes 2017-03-28 15:21:12.098238470 +0200 +++ /work/SRC/openSUSE:Factory/.guvcview.new/guvcview.changes 2017-08-21 11:36:33.554253631 +0200 @@ -1,0 +2,39 @@ +Sat Jul 29 10:53:31 UTC 2017 - aloi...@gmx.com + +- Update to version 2.0.5 + * terminate configure if qt5 is enabled and moc is missing + * add sfml render + * fix aac encoder (replace experimental aac by libvo_aacenc) + * fix build against newer kernels + * disable window key pressed events if a string control has focus + * fix video monotonic pts flag value in encoder context + * fix audio cleanup + * add support for HEVC (h265) video codec + * fix muxed h264 support; fix raw output (alloc outbuf frame) + * add circular buffer for delayed audio frames pts + * remove support for older libavcodec versions (< 54.01) + * add support for VP9 + * fix motion estimation method for x264 [1-4] + * fix buggy behaviour for file names without extension + * add support for sfml render + * drop support for sdl1 based render + * Flavio Spagnuolo <flavio.spagnu...@gmail.com>: fix matroska + clean up when audio is disabled + * fix segfault when destroying mutexes by unlocking already + unlocked mutexes + * fix libc readdir_r deprecated warning: replace by readdir + * add extra video fx filters + +- Dropped guvcview-2.0.4_ffmpeg-3.0.patch (merged upstream) + +- Split lang package contents between guvcview-lang and a new + libgviewv4l2core-lang + +- Added separate -qt5 and -qt5-lang packages and pre_checkin.sh + and guvcview-qt5-nolibs_qt5names.patch to support them + +- Added guvcview-qt5-ppc64_QVariant.patch to fix build on ppc64 + +- Replaced some in-spec commands with guvcview-SUSE.patch + +------------------------------------------------------------------- Old: ---- guvcview-2.0.4_ffmpeg-3.0.patch guvcview-src-2.0.4.tar.gz New: ---- guvcview-SUSE.patch guvcview-qt5-nolibs_qt5names.patch guvcview-qt5-ppc64_QVariant.patch guvcview-qt5.changes guvcview-qt5.spec guvcview-src-2.0.5.tar.gz pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guvcview-qt5.spec ++++++ # # spec file for package guvcview-qt5 # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Malcolm J Lewis <malcolmle...@opensuse.org> # Copyright (c) 2013 Marguerite Su <marguer...@opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define sover 2_0-2 Name: guvcview-qt5 Version: 2.0.5 Release: 0 # Reference to GPL-2.0 in some files? Summary: Qt5 UVC Viewer and Capturer License: GPL-3.0 Group: Productivity/Multimedia/Video/Players Url: http://guvcview.sourceforge.net/ Source0: http://sourceforge.net/projects/guvcview/files/source/guvcview-src-%{version}.tar.gz Source90: pre_checkin.sh # 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-UPSTREAM guvcview-qt5-ppc64_QVariant.patch -- fix conversion bug on ppc64 Patch2: guvcview-qt5-ppc64_QVariant.patch BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: guvcview-devel = %{version} BuildRequires: intltool BuildRequires: libtool BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Widgets) Recommends: %{name}-lang %description A Qt5 interface for capturing and viewing video from devices supported by the Linux UVC driver, although it should also work with any v4l2 compatible device. %lang_package %prep %setup -q -n guvcview-src-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %build autoreconf -fiv %configure --disable-debian-menu \ --disable-desktop \ --disable-gtk3 \ --enable-qt5 \ --program-suffix=-qt5 make %{?_smp_mflags} %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 %fdupes %{buildroot} %find_lang %{name} %{?no_lang_C} %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name} %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/%{name}.1%{ext_man} %files lang -f %{name}.lang %changelog ++++++ guvcview.spec ++++++ --- /var/tmp/diff_new_pack.xfennk/_old 2017-08-21 11:36:35.266012888 +0200 +++ /var/tmp/diff_new_pack.xfennk/_new 2017-08-21 11:36:35.306007263 +0200 @@ -1,6 +1,7 @@ # # spec file for package guvcview # +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Malcolm J Lewis <malcolmle...@opensuse.org> # Copyright (c) 2013 Marguerite Su <marguer...@opensuse.org> # @@ -13,23 +14,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.links2linux.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define sover 2_0-2 Name: guvcview -Version: 2.0.4 +Version: 2.0.5 Release: 0 -License: GPL-3.0 # Reference to GPL-2.0 in some files? Summary: GTK+ UVC Viewer and Capturer -Url: http://guvcview.sourceforge.net/ +License: GPL-3.0 Group: Productivity/Multimedia/Video/Players +Url: http://guvcview.sourceforge.net/ Source0: http://sourceforge.net/projects/guvcview/files/source/guvcview-src-%{version}.tar.gz -Patch3: guvcview-2.0.4_ffmpeg-3.0.patch +Source90: pre_checkin.sh +# PATCH-FIX-OPENSUSE guvcview-SUSE.patch -- use SUSE-specific paths +Patch0: guvcview-SUSE.patch BuildRequires: alsa-devel +BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext @@ -38,15 +42,16 @@ BuildRequires: intltool BuildRequires: libpng-devel BuildRequires: libpulse-devel +BuildRequires: libtool BuildRequires: libudev-devel BuildRequires: libusb-1_0-devel BuildRequires: libv4l-devel BuildRequires: pkg-config +BuildRequires: portaudio-devel +BuildRequires: update-desktop-files BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(sdl2) -BuildRequires: portaudio-devel -BuildRequires: update-desktop-files Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,6 +90,7 @@ %package -n libgviewv4l2core-%{sover} Summary: GTK+ UVC Viewer and Capturer Group: System/Libraries +Recommends: libgviewv4l2core-lang %description -n libgviewv4l2core-%{sover} A GTK interface for capturing and viewing video from devices @@ -94,22 +100,22 @@ %package devel Summary: GTK+ UVC Viewer and Capturer Group: Development/Libraries/C and C++ +Requires: alsa-devel +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: portaudio-devel -Requires: alsa-devel -Requires: glibc-devel +Requires: libpng-devel Requires: libpulse-devel -Requires: pkgconfig(libavcodec) -Requires: pkgconfig(libavutil) -Requires: gsl-devel -Requires: libSDL2-devel -Requires: libv4l-devel Requires: libudev-devel Requires: libusb-1_0-devel -Requires: libpng-devel +Requires: libv4l-devel +Requires: portaudio-devel +Requires: pkgconfig(libavcodec) +Requires: pkgconfig(libavutil) %description devel A GTK interface for capturing and viewing video from devices @@ -118,43 +124,37 @@ %lang_package +%package -n libgviewv4l2core-lang +Summary: Languages for libgviewv4l2core +Group: System/Localization +Requires: libgviewv4l2core-%{sover} = %{version} +Provides: libgviewv4l2core-lang-all = %{version} +Supplements: packageand(bundle-lang-other:libgviewv4l2core-%{sover}) +BuildArch: noarch + +%description -n libgviewv4l2core-lang +Provides translations to libgviewv4l2core. + %prep %setup -q -n %{name}-src-%{version} -%patch3 -p1 -chmod -x ChangeLog +%patch0 -p1 %build +autoreconf -fiv %configure --disable-debian-menu \ --disable-desktop make %{?_smp_mflags} %install %make_install -# Remove installed documentation -pushd %{buildroot}%{_datadir}/doc -rm -rf %{name} -popd # 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 -pushd %{buildroot}%{_datadir}/pixmaps -cp %{name}/%{name}.png . -popd %find_lang %{name} %{?no_lang_C} -%find_lang gview_v4l2core %{name}.lang %{?no_lang_C} +%find_lang gview_v4l2core libgviewv4l2core.lang %{?no_lang_C} %fdupes %{buildroot} rm -f %{buildroot}%{_libdir}/*.{la,a} -%if 0%{?suse_version} > 1130 -%post -%desktop_database_post -%endif - -%if 0%{?suse_version} > 1130 -%postun -%desktop_database_postun -%endif - %post -n libgviewaudio-%{sover} -p /sbin/ldconfig %postun -n libgviewaudio-%{sover} -p /sbin/ldconfig @@ -216,4 +216,6 @@ %files lang -f %{name}.lang +%files -n libgviewv4l2core-lang -f libgviewv4l2core.lang + %changelog ++++++ guvcview-SUSE.patch ++++++ From: Luigi Baldoni <aloi...@gmx.com> 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.5/data/icons/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 @@ -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: ++++++ guvcview-qt5-nolibs_qt5names.patch ++++++ From: Luigi Baldoni <aloi...@gmx.com> 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.5/Makefile.am =================================================================== --- guvcview-src-2.0.5.orig/Makefile.am +++ guvcview-src-2.0.5/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.5/guvcview/Makefile.am =================================================================== --- guvcview-src-2.0.5.orig/guvcview/Makefile.am +++ guvcview-src-2.0.5/guvcview/Makefile.am @@ -56,14 +56,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.5/data/icons/Makefile.am =================================================================== --- guvcview-src-2.0.5.orig/data/icons/Makefile.am +++ guvcview-src-2.0.5/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.5/configure.ac =================================================================== --- guvcview-src-2.0.5.orig/configure.ac +++ guvcview-src-2.0.5/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) ++++++ guvcview-qt5-ppc64_QVariant.patch ++++++ From: Luigi Baldoni <aloi...@gmx.com> Date: 2017-07-29 10:30:35 +0200 Subject: Fix ppc64/ppc64le build References: https://sourceforge.net/p/guvcview/tickets/38 Upstream: submitted Corrects conversion problem on ppc64/ppc64le architectures. Index: guvcview-src-2.0.5/guvcview/gui_qt5_v4l2ctrls.cpp =================================================================== --- guvcview-src-2.0.5.orig/guvcview/gui_qt5_v4l2ctrls.cpp +++ guvcview-src-2.0.5/guvcview/gui_qt5_v4l2ctrls.cpp @@ -463,7 +463,7 @@ int MainWindow::gui_attach_qt5_v4l2ctrls else { QString text_input = QString("%1").arg(current->menu[j].value, 4, 10, QChar('0')); - combobox->addItem(text_input, current->menu[j].value); + combobox->addItem(text_input, QVariant::fromValue(current->menu[j].value)); } if(current->value == (int) current->menu[j].index) def = j; ++++++ guvcview-src-2.0.4.tar.gz -> guvcview-src-2.0.5.tar.gz ++++++ ++++ 72555 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ #! /bin/sh cp guvcview.changes guvcview-qt5.changes
