Hello community, here is the log from the commit of package dvbcut for openSUSE:Factory checked in at 2019-04-23 14:36:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dvbcut (Old) and /work/SRC/openSUSE:Factory/.dvbcut.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvbcut" Tue Apr 23 14:36:00 2019 rev:2 rq:696761 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/dvbcut/dvbcut.changes 2018-07-18 22:53:58.462954047 +0200 +++ /work/SRC/openSUSE:Factory/.dvbcut.new.5536/dvbcut.changes 2019-04-23 14:36:03.633473079 +0200 @@ -1,0 +2,15 @@ +Mon Apr 22 12:06:41 UTC 2019 - Luigi Baldoni <aloi...@gmx.com> + +- Update to version 0.7.3 + * Be able to build with Qt5 utils with -qt5 postfix. + * Fix issue with reencoded frames appear with 50 FPS. + * Switch copyright-format URL from http to https. + * Bump standards version from 3.9.8 to 4.1.4. + * Bump debhelper version from 10 to 11. + * Remove trailing whitespace from debian files. + +- Dropped dvbcut-qt5_utils.patch (merged upstream) + +- Refreshed dvbcut-appicon.patch + +------------------------------------------------------------------- Old: ---- dvbcut-0.7.2.tar.gz dvbcut-qt5_utils.patch New: ---- dvbcut-0.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvbcut.spec ++++++ --- /var/tmp/diff_new_pack.J6ggA9/_old 2019-04-23 14:36:04.601473724 +0200 +++ /var/tmp/diff_new_pack.J6ggA9/_new 2019-04-23 14:36:04.601473724 +0200 @@ -1,7 +1,7 @@ # # spec file for package dvbcut # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,18 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dvbcut -Version: 0.7.2 +Version: 0.7.3 Release: 0 Summary: Qt application for cutting parts out of DVB streams License: GPL-2.0-or-later AND LGPL-2.1-only Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://github.com/bernhardu/dvbcut-deb Source0: https://github.com/bernhardu/dvbcut-deb/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-OPENSUSE dvbcut-qt5_utils.patch aloi...@gmx.com -- also search for binaries with -qt5 ending -Patch0: dvbcut-qt5_utils.patch # PATCH-FIX-OPENSUSE dvbcut-use_pkgconfig.patch aloi...@gmx.com -- use pkgconfig for ffmpeg libraries Patch1: dvbcut-use_pkgconfig.patch # PATCH-FIX-OPENSUSE dvbcut-a52.patch aloi...@gmx.com -- Support new version of liba52 @@ -36,6 +34,7 @@ Patch4: dvbcut-locale.patch BuildRequires: automake BuildRequires: fdupes +BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist BuildRequires: libtool BuildRequires: pkgconfig @@ -68,7 +67,6 @@ %prep %setup -q -n %{name}-deb-%{version} -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -91,8 +89,8 @@ %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name} +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/mime/packages/%{name}.xml -%{_datadir}/pixmaps/%{name}.svg %{_mandir}/man1/%{name}.1%{?ext_man} %changelog ++++++ dvbcut-0.7.2.tar.gz -> dvbcut-0.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/Makefile.in new/dvbcut-deb-0.7.3/Makefile.in --- old/dvbcut-deb-0.7.2/Makefile.in 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/Makefile.in 2018-08-20 01:08:52.000000000 +0200 @@ -30,9 +30,9 @@ pkgdatadir = $(datarootdir)/dvbcut installdirs = $(DESTDIR)$(man1dir) \ - $(DESTDIR)$(pkgdatadir)/icons \ - $(DESTDIR)/usr/share/applications \ - $(DESTDIR)/usr/share/mime/packages + $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps \ + $(DESTDIR)$(datadir)/applications \ + $(DESTDIR)$(datadir)/mime/packages INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -47,10 +47,9 @@ dep-local: install-local: $(installdirs) dvbcut.1 dvbcut.desktop dvbcut.xml $(INSTALL_DATA) dvbcut.1 $(DESTDIR)$(man1dir)/dvbcut.1 - $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)/usr/share/applications - $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(pkgdatadir)/icons - $(INSTALL_DATA) dvbcut.xml $(DESTDIR)/usr/share/mime/packages - -update-mime-database $(DESTDIR)/usr/share/mime + $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)$(datadir)/applications + $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps + $(INSTALL_DATA) dvbcut.xml $(DESTDIR)$(datadir)/mime/packages $(installdirs): $(SHELL) $(top_srcdir)/mkinstalldirs $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/README new/dvbcut-deb-0.7.3/README --- old/dvbcut-deb-0.7.2/README 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/README 2018-08-20 01:08:52.000000000 +0200 @@ -1,6 +1,6 @@ -DVBCUT README -- last edited 2018-01-26 +DVBCUT README -- last edited 2018-08-20 -I am pleased to announce version 0.7.2 of dvbcut. +I am pleased to announce version 0.7.3 of dvbcut. See the file "COPYING" for license issues. See the file "INSTALL" file for installation instructions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/VERSION new/dvbcut-deb-0.7.3/VERSION --- old/dvbcut-deb-0.7.2/VERSION 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/VERSION 2018-08-20 01:08:52.000000000 +0200 @@ -1 +1 @@ -0.7.2 +0.7.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/configure.ac new/dvbcut-deb-0.7.3/configure.ac --- old/dvbcut-deb-0.7.2/configure.ac 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/configure.ac 2018-08-20 01:08:52.000000000 +0200 @@ -110,6 +110,14 @@ [HAVE_QT5="yes"], [AC_MSG_ERROR([Qt5Widgets library not found])]) +AC_CHECK_PROGS(MOC, [moc-qt5 moc]) +AC_CHECK_PROGS(UIC, [uic-qt5 uic]) +AC_CHECK_PROGS(RCC, [rcc-qt5 rcc]) +AC_CHECK_PROGS(LRELEASE, [lrelease-qt5 lrelease]) +if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then + AC_MSG_ERROR([Qt utility programs moc, uic, rcc and lrelease are required.]) +fi + if test "x$HAVE_QT5" = "xyes"; then QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Xml Qt5Widgets` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/debian/changelog new/dvbcut-deb-0.7.3/debian/changelog --- old/dvbcut-deb-0.7.2/debian/changelog 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/debian/changelog 2018-08-20 01:08:52.000000000 +0200 @@ -1,3 +1,21 @@ +dvbcut (0.7.2-1) unstable; urgency=low + + * New upstream release 0.7.2. + Just minor changes for compatibility and to avoid compiler warnings. + + * Packaging changes suggested by Gianfranco Costamagna (in #844734): + - Bump debian/compat from 9 to 10. + - Remove Depends that get automatically added. + - Remove Build-Depends autotools-dev and dh-autoreconf. + - Remove unnecessary overrides in debian/rules. + * Remove configure options for Qt and ffmpeg that led to wrong link flags. + (Closes: #850073) Thanks to John David Anglin. + * Avoid dpkg-parsechangelog to avoid Lintian message. + * Contains upstream change to compile against FFMPeg 3.5. + (Closes: #888351) Thanks to James Cowgill. + + -- Bernhard Übelacker <bernha...@mailbox.org> Fri, 26 Jan 2018 23:49:20 +0100 + dvbcut (0.7.1-1) unstable; urgency=low [ Bernhard Übelacker ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/debian/compat new/dvbcut-deb-0.7.3/debian/compat --- old/dvbcut-deb-0.7.2/debian/compat 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/debian/compat 2018-08-20 01:08:52.000000000 +0200 @@ -1 +1 @@ -9 +10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/debian/control new/dvbcut-deb-0.7.3/debian/control --- old/dvbcut-deb-0.7.2/debian/control 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/debian/control 2018-08-20 01:08:52.000000000 +0200 @@ -3,9 +3,7 @@ Priority: optional Maintainer: Bernhard Übelacker <bernha...@mailbox.org> Build-Depends: - debhelper (>= 9), - autotools-dev, - dh-autoreconf, + debhelper (>= 10), liba52-0.7.4-dev, libao-dev, libavcodec-dev (>> 6:11~), @@ -26,9 +24,6 @@ Package: dvbcut Architecture: any Depends: - libqt5gui5, - libqt5widgets5, - libqt5core5a, ${misc:Depends}, ${shlibs:Depends} Recommends: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/debian/rules new/dvbcut-deb-0.7.3/debian/rules --- old/dvbcut-deb-0.7.2/debian/rules 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/debian/rules 2018-08-20 01:08:52.000000000 +0200 @@ -2,23 +2,16 @@ export QT_SELECT := qt5 -export DEB_CONFIGURE_EXTRA_FLAGS += --with-ffmpeg=/usr - export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -DVBCUT_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p') +include /usr/share/dpkg/pkg-info.mk +DVBCUT_VERSION := $(DEB_VERSION) export CPPFLAGS += -DDVBCUT_VERSION=\"$(DVBCUT_VERSION)\" %: - dh $@ --buildsystem=autoconf --with=autoreconf,autotools-dev --parallel - -override_dh_auto_clean: - [ ! -f Makefile ] || make -f Makefile distclean - dh_clean dvbcut.desktop src/Makefile configure - dh_clean - dh_auto_clean + dh $@ override_dh_auto_install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/dvbcut.desktop.in new/dvbcut-deb-0.7.3/dvbcut.desktop.in --- old/dvbcut-deb-0.7.2/dvbcut.desktop.in 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/dvbcut.desktop.in 2018-08-20 01:08:52.000000000 +0200 @@ -2,15 +2,15 @@ Type=Application Version=1.0 Name=DVBcut -GenericName=DVB Cutting Program -GenericName[de]=DVB-Schnittprogramm +GenericName=DVB Cutting Program for MPEG Transport Stream files +GenericName[de]=DVB-Schnittprogramm für MPEG Tranport Stream Dateien NoDisplay=false -Comment=Cut DVB streams -Comment[de]=Schneide DVB-Videos +Comment=Trim and cut video MPEG2 transport streams into multiple export formats +Comment[de]=Kürze und schneide MPEG Tranport Ströme in verschiedene Exportformate Icon=@prefix@/share/dvbcut/icons/dvbcut.svg TryExec=@prefix@/bin/dvbcut Exec=@prefix@/bin/dvbcut %F Terminal=false -MimeType=application/x-dvbcut;video/mp2t; +MimeType=application/x-dvbcut;video/mp2t;video/mpeg; Categories=AudioVideo;AudioVideoEditing;Qt; StartupWMClass=Dvbcut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/src/Makefile.in new/dvbcut-deb-0.7.3/src/Makefile.in --- old/dvbcut-deb-0.7.2/src/Makefile.in 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/src/Makefile.in 2018-08-20 01:08:52.000000000 +0200 @@ -29,7 +29,7 @@ datarootdir = @datarootdir@ mandir = @mandir@ man1dir = $(mandir)/man1 -helpdir = $(prefix)/share/dvbcut +helpdir = $(datadir)/dvbcut installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(helpdir) @@ -55,16 +55,16 @@ PATH := $(QTDIR)/bin:$(PATH) ui_%.h: %.ui - uic -o $@ $< + @UIC@ -o $@ $< uic_%.cpp: %.h - uic -o $@ $< + @UIC@ -o $@ $< moc_%.cpp: %.h - moc -o $@ $< + @MOC@ -o $@ $< %.qm: %.ts - lrelease $< -qm $@ + @LRELEASE@ $< -qm $@ MOC = \ moc_dvbcut.cpp \ @@ -117,7 +117,7 @@ mkdir $@ qrc_icons.cpp: - rcc -name icons -o $@ ../icons/icons.qrc + @RCC@ -name icons -o $@ ../icons/icons.qrc $(topdir)/bin/dvbcut$(EXEEXT): dvbcut$(EXEEXT) $(INSTALL_PROGRAM) dvbcut$(EXEEXT) $(topdir)/bin/dvbcut$(EXEEXT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/src/mpgfile.cpp new/dvbcut-deb-0.7.3/src/mpgfile.cpp --- old/dvbcut-deb-0.7.2/src/mpgfile.cpp 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/src/mpgfile.cpp 2018-08-20 01:08:52.000000000 +0200 @@ -51,7 +51,8 @@ mpgfile::mpgfile(inbuffer &b, int initial_offset) : buf(b), videostreams(0),audiostreams(0), - initialoffset(initial_offset),idx(*this),pictures(0) + initialoffset(initial_offset),idx(*this),pictures(0), + time_base_num(1), time_base_den(25) {} mpgfile::~mpgfile() @@ -182,6 +183,7 @@ if (frameFinished) { + //fprintf(stderr, "* decoded frame %5d ilace:%d typ:%d pts=%f\n", pic, avf->interlaced_frame, avf->pict_type, (double)avf->pts/90000.0); if (last_cpn!=avf->coded_picture_number) { last_cpn=avf->coded_picture_number; @@ -227,6 +229,13 @@ } } + time_base_num = S->avcc->time_base.num; + time_base_den = S->avcc->time_base.den; + if (S->avcc->ticks_per_frame > 0) { + //fprintf(stderr, "field rate -> frame rate\n"); + time_base_num *= S->avcc->ticks_per_frame; + } + avcodec_close(S->avcc); } @@ -738,7 +747,7 @@ AVCodecContext *avcc=s[VIDEOSTREAM].avcc; if (!avcc) return; - s[VIDEOSTREAM].setvideoencodingparameters(); + s[VIDEOSTREAM].setvideoencodingparameters(time_base_num, time_base_den, !framelist.empty() ? (*framelist.front())->interlaced_frame : 0); if (int rv=avcodec_open2(avcc, s[VIDEOSTREAM].enc, NULL)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/src/mpgfile.h new/dvbcut-deb-0.7.3/src/mpgfile.h --- old/dvbcut-deb-0.7.2/src/mpgfile.h 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/src/mpgfile.h 2018-08-20 01:08:52.000000000 +0200 @@ -51,6 +51,7 @@ int initialoffset; class index idx; int pictures; + int time_base_num, time_base_den; mpgfile(inbuffer &b, int initial_offset); @@ -184,7 +185,7 @@ } void setvideoencodingparameters() { - s[videostream()].setvideoencodingparameters(); + s[videostream()].setvideoencodingparameters(time_base_num, time_base_den); } int generateindex(const char *savefilename=0, std::string *errorstring=0, logoutput *log=0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvbcut-deb-0.7.2/src/stream.h new/dvbcut-deb-0.7.3/src/stream.h --- old/dvbcut-deb-0.7.2/src/stream.h 2018-01-27 14:16:58.000000000 +0100 +++ new/dvbcut-deb-0.7.3/src/stream.h 2018-08-20 01:08:52.000000000 +0200 @@ -57,7 +57,7 @@ avcc=avcodec_alloc_context3(NULL); avcodec_get_context_defaults3(avcc, NULL); } - void setvideoencodingparameters(bool interlaced=false) + void setvideoencodingparameters(int tb_num, int tb_den, bool interlaced=false) { avcc->bit_rate=9500000; avcc->rc_min_rate=9500000; @@ -75,6 +75,9 @@ #endif if (interlaced) avcc->flags |= AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME; + avcc->time_base.num = tb_num; + avcc->time_base.den = tb_den; + //fprintf(stderr, "video %stb=%d/%d\n", (interlaced ? "interlaced " : ""), avcc->time_base.num, avcc->time_base.den); } friend class mpgfile; ++++++ dvbcut-appicon.patch ++++++ --- /var/tmp/diff_new_pack.J6ggA9/_old 2019-04-23 14:36:04.673473772 +0200 +++ /var/tmp/diff_new_pack.J6ggA9/_new 2019-04-23 14:36:04.673473772 +0200 @@ -1,33 +1,11 @@ -Index: dvbcut-deb-0.7.2/Makefile.in +Index: dvbcut-deb-0.7.3/dvbcut.desktop.in =================================================================== ---- dvbcut-deb-0.7.2.orig/Makefile.in -+++ dvbcut-deb-0.7.2/Makefile.in -@@ -31,6 +31,7 @@ pkgdatadir = $(datarootdir)/dvbcut - - installdirs = $(DESTDIR)$(man1dir) \ - $(DESTDIR)$(pkgdatadir)/icons \ -+ $(DESTDIR)/usr/share/pixmaps \ - $(DESTDIR)/usr/share/applications \ - $(DESTDIR)/usr/share/mime/packages - -@@ -49,8 +50,8 @@ install-local: $(installdirs) dvbcut.1 d - $(INSTALL_DATA) dvbcut.1 $(DESTDIR)$(man1dir)/dvbcut.1 - $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)/usr/share/applications - $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(pkgdatadir)/icons -+ $(INSTALL_DATA) dvbcut.svg $(DESTDIR)/usr/share/pixmaps - $(INSTALL_DATA) dvbcut.xml $(DESTDIR)/usr/share/mime/packages -- -update-mime-database $(DESTDIR)/usr/share/mime - - $(installdirs): - $(SHELL) $(top_srcdir)/mkinstalldirs $@ -Index: dvbcut-deb-0.7.2/dvbcut.desktop.in -=================================================================== ---- dvbcut-deb-0.7.2.orig/dvbcut.desktop.in -+++ dvbcut-deb-0.7.2/dvbcut.desktop.in -@@ -7,7 +7,7 @@ GenericName[de]=DVB-Schnittprogramm +--- dvbcut-deb-0.7.3.orig/dvbcut.desktop.in ++++ dvbcut-deb-0.7.3/dvbcut.desktop.in +@@ -7,7 +7,7 @@ GenericName[de]=DVB-Schnittprogramm für NoDisplay=false - Comment=Cut DVB streams - Comment[de]=Schneide DVB-Videos + Comment=Trim and cut video MPEG2 transport streams into multiple export formats + Comment[de]=Kürze und schneide MPEG Tranport Ströme in verschiedene Exportformate -Icon=@prefix@/share/dvbcut/icons/dvbcut.svg +Icon=dvbcut TryExec=@prefix@/bin/dvbcut
