Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2021-05-15 23:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mjpegtools" Sat May 15 23:15:43 2021 rev:53 rq:892544 version:2.2.0~beta Changes: -------- --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2018-08-27 13:47:34.816400129 +0200 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new.2988/mjpegtools.changes 2021-05-15 23:16:44.180607497 +0200 @@ -1,0 +2,17 @@ +Tue May 11 10:50:23 UTC 2021 - pgaj...@suse.com + +- version update to 2.2.0~beta +- modified patches + % mjpegtools-2.0.0-fix-bashisms.patch (refreshed) + % mjpegtools-v4l-2.6.38.patch (refreshed) + % mjpegtools-vector_alignment.patch (refreshed) +- modified sources + % baselibs.conf +- deleted patches + - mjpegtools-config_h.patch (upstreamed) + - mjpegtools-cpuinfo.patch (not needed) + - mjpegtools-gcc47.patch (upstreamed) + - mjpegtools-more-pie.patch (upstreamed) + - mjpegtools-no_arch_tuning.patch + +------------------------------------------------------------------- Old: ---- mjpegtools-2.0.0.tar.gz mjpegtools-config_h.patch mjpegtools-cpuinfo.patch mjpegtools-gcc47.patch mjpegtools-more-pie.patch mjpegtools-no_arch_tuning.patch New: ---- mjpegtools-2.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.d1V38b/_old 2021-05-15 23:16:44.720605388 +0200 +++ /var/tmp/diff_new_pack.d1V38b/_new 2021-05-15 23:16:44.724605373 +0200 @@ -1,7 +1,7 @@ # # spec file for package mjpegtools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,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.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define lib_version %(echo %{version} | cut -d. -f1-2) +%define src_version 2.2.0 Name: mjpegtools -Version: 2.0.0 +Version: 2.2.0~beta Release: 0 Summary: MJPEG Video Capture and Processing Tools License: GPL-2.0-only Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://mjpeg.sourceforge.net/ -Source: http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz +Source: https://netix.dl.sourceforge.net/project/mjpeg/mjpegtools/%{src_version}/mjpegtools-%{src_version}.tar.bz2 Source99: baselibs.conf -Patch0: mjpegtools-cpuinfo.patch Patch1: mjpegtools-vector_alignment.patch Patch2: mjpegtools-getopt.patch Patch3: mjpegtools-writeable_strings.patch -Patch4: mjpegtools-no_arch_tuning.patch -Patch5: mjpegtools-config_h.patch Patch6: mjpegtools-v4l-2.6.38.patch -Patch7: mjpegtools-gcc47.patch Patch8: mjpegtools-2.0.0-fix-bashisms.patch -Patch9: mjpegtools-more-pie.patch BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtool @@ -47,7 +43,7 @@ BuildRequires: pkgconfig(libv4l1) BuildRequires: pkgconfig(sdl) Requires(post): info -Requires(preun): info +Requires(preun):info Obsoletes: mjpegtools-orig-addon %description @@ -57,77 +53,77 @@ zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n libmjpegutils-2_0-0 +%package -n libmjpegutils-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n libmjpegutils-2_0-0 +%description -n libmjpegutils-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n liblavfile-2_0-0 +%package -n liblavfile-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n liblavfile-2_0-0 +%description -n liblavfile-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n liblavjpeg-2_0-0 +%package -n liblavjpeg-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n liblavjpeg-2_0-0 +%description -n liblavjpeg-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n liblavplay-2_0-0 +%package -n liblavplay-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n liblavplay-2_0-0 +%description -n liblavplay-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n liblavrec-2_0-0 +%package -n liblavrec-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n liblavrec-2_0-0 +%description -n liblavrec-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n libmplex2-2_0-0 +%package -n libmplex2-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n libmplex2-2_0-0 +%description -n libmplex2-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n libmpeg2encpp-2_0-0 +%package -n libmpeg2encpp-2_2-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries -%description -n libmpeg2encpp-2_0-0 +%description -n libmpeg2encpp-2_2-0 The mjpegtools allow for capture, playback, processing, and simple editing of MJPEG AV data. The hardware I/O applications are intended for use with Zoran MJPEG framegrabber-based hardware (see the @@ -137,13 +133,13 @@ %package -n libmjpegutils-devel Summary: MJPEG Video Capture and Processing Tools Group: Development/Libraries/C and C++ -Requires: liblavfile-2_0-0 = %{version} -Requires: liblavjpeg-2_0-0 = %{version} -Requires: liblavplay-2_0-0 = %{version} -Requires: liblavrec-2_0-0 = %{version} -Requires: libmjpegutils-2_0-0 = %{version} -Requires: libmpeg2encpp-2_0-0 = %{version} -Requires: libmplex2-2_0-0 = %{version} +Requires: liblavfile-2_2-0 = %{version} +Requires: liblavjpeg-2_2-0 = %{version} +Requires: liblavplay-2_2-0 = %{version} +Requires: liblavrec-2_2-0 = %{version} +Requires: libmjpegutils-2_2-0 = %{version} +Requires: libmpeg2encpp-2_2-0 = %{version} +Requires: libmplex2-2_2-0 = %{version} Provides: mjpegtools-devel = %{version} Obsoletes: mjpegtools-devel < %{version} @@ -152,17 +148,8 @@ mjpegtools libraries. %prep -%autosetup -N -%patch0 -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -%patch5 -%patch6 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%autosetup -N -n %{name}-%{src_version} +%autopatch -p1 %build sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc @@ -175,11 +162,10 @@ export CFLAGS="%{optflags} $(pkg-config --cflags SDL_gfx)" %configure \ --disable-static \ - --disable-arch_tuning \ --without-gtk \ $EXTRAOPTS \ %{nil} -make %{?_smp_mflags} +%make_build %install %make_install @@ -191,53 +177,47 @@ %preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info%{ext_info} -%post -n libmjpegutils-2_0-0 -p /sbin/ldconfig -%postun -n libmjpegutils-2_0-0 -p /sbin/ldconfig - -%post -n liblavfile-2_0-0 -p /sbin/ldconfig -%postun -n liblavfile-2_0-0 -p /sbin/ldconfig - -%post -n liblavjpeg-2_0-0 -p /sbin/ldconfig -%postun -n liblavjpeg-2_0-0 -p /sbin/ldconfig - -%post -n liblavplay-2_0-0 -p /sbin/ldconfig -%postun -n liblavplay-2_0-0 -p /sbin/ldconfig - -%post -n liblavrec-2_0-0 -p /sbin/ldconfig -%postun -n liblavrec-2_0-0 -p /sbin/ldconfig - -%post -n libmplex2-2_0-0 -p /sbin/ldconfig -%postun -n libmplex2-2_0-0 -p /sbin/ldconfig - -%post -n libmpeg2encpp-2_0-0 -p /sbin/ldconfig -%postun -n libmpeg2encpp-2_0-0 -p /sbin/ldconfig +%post -n libmjpegutils-2_2-0 -p /sbin/ldconfig +%postun -n libmjpegutils-2_2-0 -p /sbin/ldconfig +%post -n liblavfile-2_2-0 -p /sbin/ldconfig +%postun -n liblavfile-2_2-0 -p /sbin/ldconfig +%post -n liblavjpeg-2_2-0 -p /sbin/ldconfig +%postun -n liblavjpeg-2_2-0 -p /sbin/ldconfig +%post -n liblavplay-2_2-0 -p /sbin/ldconfig +%postun -n liblavplay-2_2-0 -p /sbin/ldconfig +%post -n liblavrec-2_2-0 -p /sbin/ldconfig +%postun -n liblavrec-2_2-0 -p /sbin/ldconfig +%post -n libmplex2-2_2-0 -p /sbin/ldconfig +%postun -n libmplex2-2_2-0 -p /sbin/ldconfig +%post -n libmpeg2encpp-2_2-0 -p /sbin/ldconfig +%postun -n libmpeg2encpp-2_2-0 -p /sbin/ldconfig %files %attr(0755,root,root) %{_bindir}/* %doc AUTHORS BUGS CHANGES HINTS NEWS PLANS README* TODO %{_mandir}/man?/*.?%{ext_man} -%{_infodir}/mjpeg-howto.info%{ext_info} +%{_infodir}/mjpeg-howto.info%{?ext_info} -%files -n libmjpegutils-2_0-0 +%files -n libmjpegutils-2_2-0 %license COPYING %{_libdir}/libmjpegutils-%{lib_version}.so.* -%files -n liblavfile-2_0-0 +%files -n liblavfile-2_2-0 %{_libdir}/liblavfile-%{lib_version}.so.* -%files -n liblavjpeg-2_0-0 +%files -n liblavjpeg-2_2-0 %{_libdir}/liblavjpeg-%{lib_version}.so.* -%files -n liblavplay-2_0-0 +%files -n liblavplay-2_2-0 %{_libdir}/liblavplay-%{lib_version}.so.* -%files -n liblavrec-2_0-0 +%files -n liblavrec-2_2-0 %{_libdir}/liblavrec-%{lib_version}.so.* -%files -n libmplex2-2_0-0 +%files -n libmplex2-2_2-0 %{_libdir}/libmplex2-%{lib_version}.so.* -%files -n libmpeg2encpp-2_0-0 +%files -n libmpeg2encpp-2_2-0 %{_libdir}/libmpeg2encpp-%{lib_version}.so.* %files -n libmjpegutils-devel ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.d1V38b/_old 2021-05-15 23:16:44.748605279 +0200 +++ /var/tmp/diff_new_pack.d1V38b/_new 2021-05-15 23:16:44.748605279 +0200 @@ -1,3 +1,3 @@ -libmjpegutils-2_0-0 -libmpeg2encpp-2_0-0 -libmplex2-2_0-0 +libmjpegutils-2_2-0 +libmpeg2encpp-2_2-0 +libmplex2-2_2-0 ++++++ mjpegtools-2.0.0-fix-bashisms.patch ++++++ --- /var/tmp/diff_new_pack.d1V38b/_old 2021-05-15 23:16:44.760605232 +0200 +++ /var/tmp/diff_new_pack.d1V38b/_new 2021-05-15 23:16:44.760605232 +0200 @@ -28,12 +28,4 @@ shift `expr $MOPTIND - 1` if [ "${QUIETLOG}" != "" ]; then -diff -Ndur mjpegtools-2.0.0/scripts/lavtc.sh mjpegtools-2.0.0-fix-bashisms/scripts/lavtc.sh ---- mjpegtools-2.0.0/scripts/lavtc.sh 2009-01-23 17:52:24.000000000 +0200 -+++ mjpegtools-2.0.0-fix-bashisms/scripts/lavtc.sh 2014-11-29 22:04:07.719912496 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # lav2tc.bash - use transcode to convert MJPEG avi files to another - # video/audio format. + ++++++ mjpegtools-2.0.0.tar.gz -> mjpegtools-2.2.0.tar.bz2 ++++++ ++++ 73368 lines of diff (skipped) ++++++ mjpegtools-v4l-2.6.38.patch ++++++ --- /var/tmp/diff_new_pack.d1V38b/_old 2021-05-15 23:16:45.332602999 +0200 +++ /var/tmp/diff_new_pack.d1V38b/_new 2021-05-15 23:16:45.332602999 +0200 @@ -1,7 +1,7 @@ -Index: lavtools/lavvideo.c +Index: mjpegtools-2.2.0/lavtools/lavvideo.c =================================================================== ---- lavtools/lavvideo.c.orig -+++ lavtools/lavvideo.c +--- mjpegtools-2.2.0.orig/lavtools/lavvideo.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/lavvideo.c 2021-05-11 12:24:57.188741183 +0200 @@ -63,7 +63,7 @@ Copyright by Gernot Ziegler. * errors here, check your linux/time.h && sys/time.h header setup. */ @@ -11,10 +11,10 @@ #include <videodev_mjpeg.h> #include <frequencies.h> -Index: lavtools/liblavplay.c +Index: mjpegtools-2.2.0/lavtools/liblavplay.c =================================================================== ---- lavtools/liblavplay.c.orig -+++ lavtools/liblavplay.c +--- mjpegtools-2.2.0.orig/lavtools/liblavplay.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/liblavplay.c 2021-05-11 12:24:57.188741183 +0200 @@ -68,7 +68,8 @@ * errors here, check your linux/time.h && sys/time.h header setup. */ @@ -25,24 +25,25 @@ #else #define VIDEO_MODE_PAL 0 #define VIDEO_MODE_NTSC 1 -Index: lavtools/liblavrec.c +Index: mjpegtools-2.2.0/lavtools/liblavrec.c =================================================================== ---- lavtools/liblavrec.c.orig -+++ lavtools/liblavrec.c -@@ -63,7 +63,8 @@ +--- mjpegtools-2.2.0.orig/lavtools/liblavrec.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/liblavrec.c 2021-05-11 12:25:27.076907401 +0200 +@@ -63,7 +63,9 @@ * errors here, check your linux/time.h && sys/time.h header setup. */ #define _LINUX_TIME_H -#include <linux/videodev.h> +#include <libv4l1-videodev.h> ++#include <linux/videodev2.h> +#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> #endif -Index: lavtools/testrec.c +Index: mjpegtools-2.2.0/lavtools/testrec.c =================================================================== ---- lavtools/testrec.c.orig -+++ lavtools/testrec.c +--- mjpegtools-2.2.0.orig/lavtools/testrec.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/testrec.c 2021-05-11 12:24:57.192741206 +0200 @@ -89,7 +89,7 @@ * errors here, check your linux/time.h && sys/time.h header setup. */ @@ -52,11 +53,11 @@ #include <linux/soundcard.h> /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ -Index: configure.ac +Index: mjpegtools-2.2.0/configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit +--- mjpegtools-2.2.0.orig/configure.ac 2021-02-11 06:09:59.000000000 +0100 ++++ mjpegtools-2.2.0/configure.ac 2021-05-11 12:24:57.192741206 +0200 +@@ -153,7 +153,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit AS_IF([test "x$with_v4l" != "xno"], [ case $host in *-*-linux*) @@ -65,20 +66,11 @@ [have_video4linux=true AC_DEFINE(HAVE_V4L, 1, [Building for Linux - using the video4linux API])], []) -@@ -173,7 +173,7 @@ esac]) - - AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"], - [have_video4linux=false -- AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) -+ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) - AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) - - dnl ********************************************************************* -Index: configure +Index: mjpegtools-2.2.0/configure =================================================================== ---- configure.orig -+++ configure -@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then : +--- mjpegtools-2.2.0.orig/configure 2021-02-11 06:23:37.000000000 +0100 ++++ mjpegtools-2.2.0/configure 2021-05-11 12:24:57.192741206 +0200 +@@ -17764,7 +17764,7 @@ if test "x$with_v4l" != "xno"; then : case $host in *-*-linux*) @@ -87,14 +79,3 @@ if test "x$ac_cv_header_linux_videodev_h" = xyes; then : have_video4linux=true -@@ -16407,8 +16407,8 @@ fi - - if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then : - have_video4linux=false -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 --$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 -+$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} - fi - if test x$have_video4linux = xtrue; then - HAVE_V4L_TRUE= ++++++ mjpegtools-vector_alignment.patch ++++++ --- /var/tmp/diff_new_pack.d1V38b/_old 2021-05-15 23:16:45.344602952 +0200 +++ /var/tmp/diff_new_pack.d1V38b/_new 2021-05-15 23:16:45.344602952 +0200 @@ -3,10 +3,10 @@ mpeg2enc/imageplanes.hh | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) -Index: mpeg2enc/imageplanes.cc +Index: mjpegtools-2.2.0/mpeg2enc/imageplanes.cc =================================================================== ---- mpeg2enc/imageplanes.cc.orig -+++ mpeg2enc/imageplanes.cc +--- mjpegtools-2.2.0.orig/mpeg2enc/imageplanes.cc 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/mpeg2enc/imageplanes.cc 2021-05-11 12:30:02.082436818 +0200 @@ -19,19 +19,22 @@ ImagePlanes::ImagePlanes( EncoderParams switch( c ) { @@ -41,13 +41,13 @@ + if( raw_planes[c] != 0 ) + delete [] raw_planes[c]; } + DiscardUserData(); } - -Index: mpeg2enc/imageplanes.hh +Index: mjpegtools-2.2.0/mpeg2enc/imageplanes.hh =================================================================== ---- mpeg2enc/imageplanes.hh.orig -+++ mpeg2enc/imageplanes.hh -@@ -50,6 +50,7 @@ class ImagePlanes +--- mjpegtools-2.2.0.orig/mpeg2enc/imageplanes.hh 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/mpeg2enc/imageplanes.hh 2021-05-11 12:30:02.082436818 +0200 +@@ -55,6 +55,7 @@ class ImagePlanes int image_data_width, int image_data_height); protected: uint8_t *planes[NUM_PLANES];
