Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2017-02-22 13:44:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mjpegtools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2015-01-10
23:06:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2017-02-22 13:44:07.352714241 +0100
@@ -1,0 +2,11 @@
+Sat Feb 18 01:35:01 UTC 2017 - zai...@opensuse.org
+
+- Split the package in smaller pieces, allowing as user to keep the
+ main/free parts from the distribution and 'enhancing' the
+ capability with simple addon-packages: libmpeg2encpp-2_0-0 (as a
+ library it is required by other code depending on it) and
+ mjpegtools-orig-addon, which is auto-recommended when the user
+ has mjpegtools installed AND has a repo enabled, containing this
+ package AND has recommends enabled.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mjpegtools.spec ++++++
--- /var/tmp/diff_new_pack.QueGOp/_old 2017-02-22 13:44:08.272583218 +0100
+++ /var/tmp/diff_new_pack.QueGOp/_new 2017-02-22 13:44:08.272583218 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mjpegtools
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -69,6 +69,25 @@
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
+# 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.
+Group: Productivity/Multimedia/Video/Editors and Convertors
+Supplements: %{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
@@ -80,10 +99,24 @@
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}
@@ -148,6 +181,13 @@
%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}
@@ -155,7 +195,12 @@
%files -n libmjpegutils-2_0-0
%defattr(0644, root, root, 0755)
%doc AUTHORS BUGS CHANGES COPYING HINTS NEWS PLANS README* TODO
-%{_libdir}/lib*-%{lib_version}.so.*
+%{_libdir}/liblavfile-%{lib_version}.so.*
+%{_libdir}/liblavjpeg-%{lib_version}.so.*
+%{_libdir}/liblavplay-%{lib_version}.so.*
+%{_libdir}/liblavrec-%{lib_version}.so.*
+%{_libdir}/libmjpegutils-%{lib_version}.so.*
+%{_libdir}/libmplex2-%{lib_version}.so.*
%files -n libmjpegutils-devel
%defattr(0644, root, root, 0755)
@@ -171,4 +216,17 @@
%{_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.QueGOp/_old 2017-02-22 13:44:08.304578660 +0100
+++ /var/tmp/diff_new_pack.QueGOp/_new 2017-02-22 13:44:08.304578660 +0100
@@ -1 +1,2 @@
libmjpegutils-2_0-0
+libmpeg2encpp-2_0-0
