Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2018-02-25 11:34:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mjpegtools" Sun Feb 25 11:34:30 2018 rev:49 rq:579043 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2018-02-21 14:09:28.858490295 +0100 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes 2018-02-25 11:34:36.983493135 +0100 @@ -1,0 +2,14 @@ +Tue Feb 20 18:27:14 UTC 2018 - [email protected] + +- No longer use patched tarball for build, mpeg2 is now available + in openSUSE: + + Drop pre_checkin.sh, mjpegtools-codecpatch.sh and + mjpegtools-codecpatch.patch, no longer needed. + + Drop BUILD_ORIG and obsolete versions conditionals. + + Drop previously conditional mjpegtools-orig-addon and + libmpeg2encpp-2_0-0 subpackages. + + Update baselibs.conf for the new build structure. + + Add mjpegtools-orig-addon and libmpeg2encpp-2_0-0 Obsoletes: + Ensure a smooth upgrade for our users. + +------------------------------------------------------------------- Old: ---- mjpegtools-2.0.0-patched.tar.gz mjpegtools-codecpatch.patch mjpegtools-codecpatch.sh pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.sM4zrg/_old 2018-02-25 11:34:37.967457408 +0100 +++ /var/tmp/diff_new_pack.sM4zrg/_new 2018-02-25 11:34:37.971457263 +0100 @@ -1,7 +1,7 @@ # # spec file for package mjpegtools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -23,15 +23,9 @@ License: GPL-2.0 Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://mjpeg.sourceforge.net/ -%if 0%{?BUILD_ORIG} Source: http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz -%else -# WARNING: This is not a comment, but a real command to repack souce: -#%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir} mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz ) -Source0: %{name}-%{version}-patched.tar.gz -%endif -Source1: mjpegtools-codecpatch.sh -Source2: baselibs.conf +Source99: baselibs.conf + Patch0: mjpegtools-cpuinfo.patch Patch1: mjpegtools-vector_alignment.patch Patch2: mjpegtools-getopt.patch @@ -42,21 +36,20 @@ Patch7: mjpegtools-gcc47.patch Patch8: mjpegtools-2.0.0-fix-bashisms.patch Patch9: mjpegtools-more-pie.patch -Patch100: mjpegtools-codecpatch.patch + BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: pkgconfig(SDL_gfx) BuildRequires: pkgconfig(libdv) BuildRequires: pkgconfig(libpng) >= 1.4 BuildRequires: pkgconfig(libquicktime) -%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libv4l1) -%endif -BuildRequires: pkgconfig(SDL_gfx) BuildRequires: pkgconfig(sdl) Requires(post): info Requires(preun): info +Obsoletes: mjpegtools-orig-addon %define lib_version %(echo %{version} | cut -d. -f1-2) @@ -67,29 +60,10 @@ zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -# This package lives on 3rd party instances -%package orig-addon -Summary: MJPEG Video Capture and Processing Tools - Patented encoders -Group: Productivity/Multimedia/Video/Editors and Convertors -# If a user has the 3rd party repo enabled and has mjpegutils installed, -# we trigger a recommended installation of the orig-addon package, completing -# the installation. -Supplements: %{name} -Requires: %{name} - -%description orig-addon -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. - -This package contains the binaries that cannot be shipped as part of the -distro repositories due to legal constraints. - %package -n libmjpegutils-2_0-0 Summary: MJPEG Video Capture and Processing Tools Group: System/Libraries +Obsoletes: libmpeg2encpp-2_0-0 %description -n libmjpegutils-2_0-0 The mjpegtools allow for capture, playback, processing, and simple @@ -98,24 +72,10 @@ zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package -n libmpeg2encpp-2_0-0 -Summary: MJPEG Video Capture and Processing Tools -Group: System/Libraries - -%description -n libmpeg2encpp-2_0-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 libmjpegutils-devel Summary: MJPEG Video Capture and Processing Tools Group: Development/Libraries/C and C++ Requires: libmjpegutils-2_0-0 = %{version} -%if 0%{?BUILD_ORIG} -Requires: libmpeg2encpp-2_0-0 = %{version} -%endif Provides: mjpegtools-devel = %{version} Obsoletes: mjpegtools-devel < %{version} @@ -124,31 +84,21 @@ mjpegtools libraries. %prep -%setup -q +%autosetup -N %patch0 -%if 0%{?BUILD_ORIG} %patch1 -%endif %patch2 -p1 %patch3 -p1 %patch4 %patch5 -%if 0%{?suse_version} >= 1210 %patch6 -%endif %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if ! 0%{?BUILD_ORIG} -# remove references to files removed by %%{name}-codecpatch.sh -%patch100 -%endif %build -%if 0%{?BUILD_ORIG} sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc diff -u mpeg2enc/mpeg2enc.cc* || : -%endif autoreconf -vfi EXTRAOPTS="" %ifarch ppc ppc64 @@ -159,13 +109,6 @@ %install %make_install -# remove mpeg encoding -%if ! 0%{?BUILD_ORIG} -for app in lav2mpeg mp2enc mpeg2enc mpegtranscode; do - rm -f %{buildroot}%{_bindir}/${app} - rm -f %{buildroot}%{_mandir}/man1/${app}.* -done -%endif rm %{buildroot}%{_libdir}/lib*.la %post @@ -177,21 +120,9 @@ %post -n libmjpegutils-2_0-0 -p /sbin/ldconfig %postun -n libmjpegutils-2_0-0 -p /sbin/ldconfig -%if 0%{?BUILD_ORIG} -%post -n libmpeg2encpp-2_0-0 -p /sbin/ldconfig -%postun -n libmpeg2encpp-2_0-0 -p /sbin/ldconfig -%endif - %files %defattr(0644, root, root, 0755) %attr(0755,root,root) %{_bindir}/* -# Exclude files only present when using BUILD_ORIG -%if 0%{?BUILD_ORIG} -%exclude %{_bindir}/lav2mpeg -%exclude %{_bindir}/mp2enc -%exclude %{_bindir}/mpeg2enc -%exclude %{_bindir}/mpegtranscode -%endif %{_mandir}/man1/*.1%{ext_man} %{_mandir}/man5/*.5%{ext_man} %{_infodir}/mjpeg-howto.info%{ext_info} @@ -205,6 +136,7 @@ %{_libdir}/liblavrec-%{lib_version}.so.* %{_libdir}/libmjpegutils-%{lib_version}.so.* %{_libdir}/libmplex2-%{lib_version}.so.* +%{_libdir}/libmpeg2encpp-%{lib_version}.so.* %files -n libmjpegutils-devel %defattr(0644, root, root, 0755) @@ -214,23 +146,8 @@ %{_libdir}/liblavplay.so %{_libdir}/liblavrec.so %{_libdir}/libmjpegutils.so -%if 0%{?BUILD_ORIG} %{_libdir}/libmpeg2encpp.so -%endif %{_libdir}/libmplex2.so %{_libdir}/pkgconfig/mjpegtools.pc -%if 0%{?BUILD_ORIG} -%files orig-addon -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/lav2mpeg -%attr(0755,root,root) %{_bindir}/mp2enc -%attr(0755,root,root) %{_bindir}/mpeg2enc -%attr(0755,root,root) %{_bindir}/mpegtranscode - -%files -n libmpeg2encpp-2_0-0 -%defattr(-,root,root) -%{_libdir}/libmpeg2encpp-%{lib_version}.so.* -%endif - %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.sM4zrg/_old 2018-02-25 11:34:37.999456246 +0100 +++ /var/tmp/diff_new_pack.sM4zrg/_new 2018-02-25 11:34:38.003456100 +0100 @@ -1,2 +1 @@ libmjpegutils-2_0-0 -libmpeg2encpp-2_0-0
