commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2018-08-27 13:47:29
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Mon Aug 27 13:47:29 2018 rev:52 rq:630891 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2018-03-08
10:56:28.587546840 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2018-08-27 13:47:34.816400129 +0200
@@ -1,0 +2,7 @@
+Wed Aug 22 10:37:29 UTC 2018 - dims...@opensuse.org
+
+- Inject pkg-config --cflags SDL_gfx into CFLAGS: the build system
+ does not use pkg-config yet to find the right parameters for
+ SDL_gfx, so we cheat like that.
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.JujkFF/_old 2018-08-27 13:47:35.496401099 +0200
+++ /var/tmp/diff_new_pack.JujkFF/_new 2018-08-27 13:47:35.500401105 +0200
@@ -16,16 +16,16 @@
#
+%define lib_version %(echo %{version} | cut -d. -f1-2)
Name: mjpegtools
Version:2.0.0
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/
+URL:http://mjpeg.sourceforge.net/
Source:
http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz
Source99: baselibs.conf
-
Patch0: mjpegtools-cpuinfo.patch
Patch1: mjpegtools-vector_alignment.patch
Patch2: mjpegtools-getopt.patch
@@ -36,7 +36,6 @@
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
@@ -51,8 +50,6 @@
Requires(preun): info
Obsoletes: mjpegtools-orig-addon
-%define lib_version %(echo %{version} | cut -d. -f1-2)
-
%description
The mjpegtools allow for capture, playback, processing, and simple
editing of MJPEG AV data. The hardware I/O applications are intended
@@ -175,6 +172,7 @@
%ifarch ppc ppc64
EXTRAOPTS="--disable-simd-accel"
%endif
+export CFLAGS="%{optflags} $(pkg-config --cflags SDL_gfx)"
%configure \
--disable-static \
--disable-arch_tuning \
commit mjpegtools for openSUSE:Factory
Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2018-03-08 10:56:26 Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new (New) Package is "mjpegtools" Thu Mar 8 10:56:26 2018 rev:51 rq:583749 version:2.0.0 Changes: --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2018-03-01 12:04:08.409997327 +0100 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes 2018-03-08 10:56:28.587546840 +0100 @@ -1,0 +2,12 @@ +Tue Mar 6 22:13:45 UTC 2018 - virtuous...@gmail.com + +- Add libmplex2-2_0-0 to baselibs.conf for gstreamer-plugins-bad-32bit + forgotten in the previous change + +--- +Tue Mar 6 05:37:58 UTC 2018 - virtuous...@gmail.com + +- Add libmpeg2encpp-2_0-0 to baselibs.conf for gstreamer-plugins-bad-32bit + which may be needed for wine's A/V support to function properly + +--- Other differences: -- ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.HRa41n/_old 2018-03-08 10:56:29.495514155 +0100 +++ /var/tmp/diff_new_pack.HRa41n/_new 2018-03-08 10:56:29.495514155 +0100 @@ -1 +1,3 @@ libmjpegutils-2_0-0 +libmpeg2encpp-2_0-0 +libmplex2-2_0-0
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2018-03-01 12:04:03
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Thu Mar 1 12:04:03 2018 rev:50 rq:580789 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2018-02-25
11:34:36.983493135 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2018-03-01 12:04:08.409997327 +0100
@@ -1,0 +2,14 @@
+Tue Feb 27 09:56:24 UTC 2018 - bjorn@gmail.com
+
+- Split libmjpegutils-2_0-0 to follow openSUSE recommended
+ guidelines for libs:
+ + liblavfile-2_0-0
+ + liblavjpeg-2_0-0
+ + liblavplay-2_0-0
+ + liblavrec-2_0-0
+ + libmplex2-2_0-0
+ + libmpeg2encpp-2_0-0
+- Run spec-cleaner, modernize spec slightly.
+- Drop libmpeg2encpp-2_0-0 Obsoletes, package is added back.
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.4nquqx/_old 2018-03-01 12:04:09.213968485 +0100
+++ /var/tmp/diff_new_pack.4nquqx/_new 2018-03-01 12:04:09.217968342 +0100
@@ -20,7 +20,7 @@
Version:2.0.0
Release:0
Summary:MJPEG Video Capture and Processing Tools
-License:GPL-2.0
+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
@@ -40,7 +40,7 @@
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
BuildRequires: libtool
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(SDL_gfx)
BuildRequires: pkgconfig(libdv)
BuildRequires: pkgconfig(libpng) >= 1.4
@@ -63,7 +63,6 @@
%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
@@ -72,10 +71,82 @@
zoran-driver package), but the processing tools can be used with MJPEG
data from other sources as well.
+%package -n liblavfile-2_0-0
+Summary:MJPEG Video Capture and Processing Tools
+Group: System/Libraries
+
+%description -n liblavfile-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 liblavjpeg-2_0-0
+Summary:MJPEG Video Capture and Processing Tools
+Group: System/Libraries
+
+%description -n liblavjpeg-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 liblavplay-2_0-0
+Summary:MJPEG Video Capture and Processing Tools
+Group: System/Libraries
+
+%description -n liblavplay-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 liblavrec-2_0-0
+Summary:MJPEG Video Capture and Processing Tools
+Group: System/Libraries
+
+%description -n liblavrec-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 libmplex2-2_0-0
+Summary:MJPEG Video Capture and Processing Tools
+Group: System/Libraries
+
+%description -n libmplex2-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 libmpeg2encpp-2_0-0
+Summary:MJPEG Video Capture and Processing Tools
+Group:
commit mjpegtools for openSUSE:Factory
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.changes2018-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 - bjorn@gmail.com
+
+- 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
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2018-02-21 14:09:27
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Wed Feb 21 14:09:27 2018 rev:48 rq:578439 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2018-01-16
09:38:00.633934123 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2018-02-21 14:09:28.858490295 +0100
@@ -1,0 +2,5 @@
+Tue Feb 20 16:04:41 UTC 2018 - bwiedem...@suse.com
+
+- Make source tarball generation reproducible (boo#1041090)
+
+---
Other differences:
--
++ mjpegtools-codecpatch.sh ++
--- /var/tmp/diff_new_pack.dXbvpz/_old 2018-02-21 14:09:29.990449532 +0100
+++ /var/tmp/diff_new_pack.dXbvpz/_new 2018-02-21 14:09:29.990449532 +0100
@@ -1,4 +1,6 @@
# removes mpeg stuff
+# likely because aenc does not have a good OSS license
+# and mpeg2 was patented until 2018-02-14
# $1 is directory with tarballs
# $2 is original tarball
# $3 is patched tarball
@@ -9,9 +11,9 @@
echo ""
trap "rm -vrf \"$TMPDIR\" \"${1}/${2}\"" ERR
cd $TMPDIR
- tar -xzf "${1}/${2}"
- rm -Rf mjpegtools-2.0.0/aenc mjpegtools-2.0.0/mpeg2enc
- tar -czf "${1}/${3}" mjpegtools-2.0.0
+ gzip -cd "${1}/${2}" > tmp.tar
+ tar --delete -f tmp.tar mjpegtools-2.0.0/aenc
mjpegtools-2.0.0/mpeg2enc
+ gzip -cn9 tmp.tar > "${1}/${3}"
cd - 1>/dev/null
rm -Rf $TMPDIR
else
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2018-01-16 09:37:59
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Tue Jan 16 09:37:59 2018 rev:47 rq:563887 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2017-11-11
14:16:31.369980267 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2018-01-16 09:38:00.633934123 +0100
@@ -1,0 +2,5 @@
+Sat Dec 30 22:41:59 UTC 2017 - zai...@opensuse.org
+
+- Add conditional post(un) handling for libmpeg2encpp-2_0-0.
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.RCDM8a/_old 2018-01-16 09:38:01.481894432 +0100
+++ /var/tmp/diff_new_pack.RCDM8a/_new 2018-01-16 09:38:01.485894244 +0100
@@ -175,9 +175,13 @@
%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
+%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}/*
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2017-11-11 14:16:30
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Sat Nov 11 14:16:30 2017 rev:46 rq:539451 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2017-04-17
10:21:22.308185978 +0200
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2017-11-11 14:16:31.369980267 +0100
@@ -1,0 +2,7 @@
+Tue Oct 31 16:36:27 UTC 2017 - zai...@opensuse.org
+
+- Drop pkgconfig(gdk-x11-2.0), pkgconfig(gobject-2.0) and
+ pkgconfig(gtk+-x11-2.0) BuildRequires and pass --without-gtk, no
+ longer build gtk2 support.
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.5d8c0V/_old 2017-11-11 14:16:32.169950947 +0100
+++ /var/tmp/diff_new_pack.5d8c0V/_new 2017-11-11 14:16:32.173950800 +0100
@@ -24,7 +24,7 @@
Group: Productivity/Multimedia/Video/Editors and Convertors
Url:http://mjpeg.sourceforge.net/
%if 0%{?BUILD_ORIG}
-Source0:
http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz
+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 )
@@ -47,9 +47,6 @@
BuildRequires: libjpeg-devel
BuildRequires: libtool
BuildRequires: pkg-config
-BuildRequires: pkgconfig(gdk-x11-2.0)
-BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(gtk+-x11-2.0)
BuildRequires: pkgconfig(libdv)
BuildRequires: pkgconfig(libpng) >= 1.4
BuildRequires: pkgconfig(libquicktime)
@@ -157,7 +154,7 @@
%ifarch ppc ppc64
EXTRAOPTS="--disable-simd-accel"
%endif
-%configure --disable-static --disable-arch_tuning $EXTRAOPTS
+%configure --disable-static --disable-arch_tuning $EXTRAOPTS --without-gtk
make %{?_smp_mflags}
%install
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2017-04-17 10:21:19
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Mon Apr 17 10:21:19 2017 rev:45 rq:484811 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2017-03-13
15:30:20.100974411 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2017-04-17 10:21:22.308185978 +0200
@@ -1,0 +2,7 @@
+Sun Apr 2 21:38:24 UTC 2017 - meiss...@suse.com
+
+- mjpegtools-more-pie.patch: remove some -fno-PIC calls. They
+ do not seem to be necessary and break PIE builds.
+ (The compiler would warn if the assembler would not build.)
+
+---
New:
mjpegtools-more-pie.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.0VybBm/_old 2017-04-17 10:21:23.759980370 +0200
+++ /var/tmp/diff_new_pack.0VybBm/_new 2017-04-17 10:21:23.759980370 +0200
@@ -41,6 +41,7 @@
Patch6: mjpegtools-v4l-2.6.38.patch
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
@@ -72,10 +73,10 @@
# 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.
-Group: Productivity/Multimedia/Video/Editors and Convertors
Supplements:%{name}
Requires: %{name}
@@ -140,6 +141,7 @@
%endif
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%if ! 0%{?BUILD_ORIG}
# remove references to files removed by %%{name}-codecpatch.sh
%patch100
@@ -172,7 +174,7 @@
%post
%install_info --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info%{ext_info}
-%postun
+%preun
%install_info_delete --info-dir=%{_infodir}
%{_infodir}/mjpeg-howto.info%{ext_info}
%post -n libmjpegutils-2_0-0 -p /sbin/ldconfig
++ mjpegtools-2.0.0-patched.tar.gz ++
++ mjpegtools-more-pie.patch ++
--- mjpegtools-2.0.0/yuvscaler/Makefile.am.xx 2017-04-02 23:15:52.764551722
+0200
+++ mjpegtools-2.0.0/yuvscaler/Makefile.am 2017-04-02 23:17:21.764460766
+0200
@@ -18,6 +18,5 @@
EXTRA_DIST = yuvscaler_implementation.txt
-yuvscaler_CFLAGS=@PROGRAM_NOPIC@
yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
--- mjpegtools-2.0.0/y4mdenoise/Makefile.am.xx 2017-04-02 23:19:52.824306262
+0200
+++ mjpegtools-2.0.0/y4mdenoise/Makefile.am 2017-04-02 23:20:04.976293826
+0200
@@ -4,8 +4,8 @@
EXTRA_DIST = implementation.html
-AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
-AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+AM_CFLAGS = -DNDEBUG -finline-functions
+AM_CXXFLAGS = -DNDEBUG -finline-functions
INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
--- mjpegtools-2.0.0/y4mutils/Makefile.am.xx2017-04-02 23:24:08.688044220
+0200
+++ mjpegtools-2.0.0/y4mutils/Makefile.am 2017-04-02 23:24:17.020035680
+0200
@@ -2,7 +2,6 @@
MAINTAINERCLEANFILES = Makefile.in
-AM_CFLAGS = @PROGRAM_NOPIC@
AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2017-03-13 15:30:00
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is "mjpegtools"
Mon Mar 13 15:30:00 2017 rev:44 rq:477965 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2017-02-22
13:44:07.352714241 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2017-03-13 15:30:20.100974411 +0100
@@ -1,0 +2,6 @@
+Fri Feb 24 11:12:26 UTC 2017 - zai...@opensuse.org
+
+- Add mjpegtools Requires to mjpegtools-orig-addon, installing the
+ addon without having the package it "extends" is pointless.
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.CPU2if/_old 2017-03-13 15:30:20.968851752 +0100
+++ /var/tmp/diff_new_pack.CPU2if/_new 2017-03-13 15:30:20.968851752 +0100
@@ -77,6 +77,7 @@
# the installation.
Group: Productivity/Multimedia/Video/Editors and Convertors
Supplements:%{name}
+Requires: %{name}
%description orig-addon
The mjpegtools allow for capture, playback, processing, and simple
commit mjpegtools for openSUSE:Factory
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.changes2015-01-10
23:06:53.0 +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
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2015-01-10 23:06:52
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.changes2014-12-06
13:47:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2015-01-10 23:06:53.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 8 15:15:11 UTC 2015 - o...@aepfle.de
+
+- BuildRequire at least libpng 1.14 due to usage of
+ PNG_TRANSFORM_GRAY_TO_RGB
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.cJEEjb/_old 2015-01-10 23:06:54.0 +0100
+++ /var/tmp/diff_new_pack.cJEEjb/_new 2015-01-10 23:06:54.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mjpegtools
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,7 @@
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gtk+-x11-2.0)
BuildRequires: pkgconfig(libdv)
-BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libpng) = 1.4
BuildRequires: pkgconfig(libquicktime)
%if 0%{?suse_version} = 1210
BuildRequires: pkgconfig(libv4l1)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2014-12-06 13:47:22
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.changes2013-09-25
14:33:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2014-12-06 13:47:11.0 +0100
@@ -1,0 +2,14 @@
+Mon Dec 1 12:53:29 UTC 2014 - kstreit...@suse.com
+
+- Added baselibs.conf as a source in the spec file (to avoid error
+ message from the Factory check script).
+
+---
+Sat Nov 29 20:11:00 UTC 2013 - Led led...@gmail.com
+
+- fix bashisms in shell scripts
+- fix shebang in lavtc.sh that contains bash-specific constructions
+- add patches:
+ * mjpegtools-2.0.0-fix-bashisms.patch
+
+---
New:
mjpegtools-2.0.0-fix-bashisms.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.TcB2D0/_old 2014-12-06 13:47:13.0 +0100
+++ /var/tmp/diff_new_pack.TcB2D0/_new 2014-12-06 13:47:13.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mjpegtools
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,7 @@
Source0:%{name}-%{version}-patched.tar.gz
%endif
Source1:mjpegtools-codecpatch.sh
+Source2:baselibs.conf
Patch0: mjpegtools-cpuinfo.patch
Patch1: mjpegtools-vector_alignment.patch
Patch2: mjpegtools-getopt.patch
@@ -39,6 +40,7 @@
Patch5: mjpegtools-config_h.patch
Patch6: mjpegtools-v4l-2.6.38.patch
Patch7: mjpegtools-gcc47.patch
+Patch8: mjpegtools-2.0.0-fix-bashisms.patch
Patch100: mjpegtools-codecpatch.patch
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
@@ -103,6 +105,7 @@
%patch6
%endif
%patch7 -p1
+%patch8 -p1
%if ! 0%{?BUILD_ORIG}
# remove references to files removed by %%{name}-codecpatch.sh
%patch100
++ mjpegtools-2.0.0-fix-bashisms.patch ++
diff -Ndur mjpegtools-2.0.0/scripts/lav2avi.sh
mjpegtools-2.0.0-fix-bashisms/scripts/lav2avi.sh
--- mjpegtools-2.0.0/scripts/lav2avi.sh 2004-08-07 05:51:14.0 +0300
+++ mjpegtools-2.0.0-fix-bashisms/scripts/lav2avi.sh2014-11-29
22:02:38.363918541 +0200
@@ -72,7 +72,11 @@
}
if [ $usage -eq 1 ]; then
- echo -e USAGE:\t`basename $0` filename.eli
- echo -e \n\tfilename - MJPEG Tools lav editing file\n
- echo -e EXAMPLE:\n\t`basename $0` SecondFilm.eli\n
+ echo USAGE:`basename $0` filename.eli
+ echo
+ echo filename - MJPEG Tools lav editing file
+ echo
+ echo EXAMPLE:
+ echo `basename $0` SecondFilm.eli
+ echo
fi
diff -Ndur mjpegtools-2.0.0/scripts/lav2mpeg
mjpegtools-2.0.0-fix-bashisms/scripts/lav2mpeg
--- mjpegtools-2.0.0/scripts/lav2mpeg 2009-01-23 17:52:25.0 +0200
+++ mjpegtools-2.0.0-fix-bashisms/scripts/lav2mpeg 2014-11-29
22:03:59.200913072 +0200
@@ -252,7 +252,7 @@
;;
esac
done
-let MOPTIND=OPTIND-LAVRC_COUNT
+MOPTIND=$((OPTIND - LAVRC_COUNT))
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.0 +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-codecpatch.sh ++
--- /var/tmp/diff_new_pack.TcB2D0/_old 2014-12-06 13:47:13.0 +0100
+++ /var/tmp/diff_new_pack.TcB2D0/_new 2014-12-06 13:47:13.0 +0100
@@ -10,7 +10,7 @@
trap rm -vrf \$TMPDIR\ \${1}/${2}\ ERR
cd $TMPDIR
tar -xzf ${1}/${2}
- rm -Rf mjpegtools-2.0.0/{aenc,mpeg2enc}
+ rm -Rf mjpegtools-2.0.0/aenc mjpegtools-2.0.0/mpeg2enc
tar -czf ${1}/${3} mjpegtools-2.0.0
cd - 1/dev/null
rm -Rf $TMPDIR
++ pre_checkin.sh ++
--- /var/tmp/diff_new_pack.TcB2D0/_old 2014-12-06 13:47:13.0 +0100
+++ /var/tmp/diff_new_pack.TcB2D0/_new 2014-12-06 13:47:13.0 +0100
@@ -2,7 +2,8 @@
for i in mjpegtools-*tar.bz2 ; do
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2013-09-25 14:33:01
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.changes2013-03-11
09:51:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2013-09-25 14:33:03.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr 9 14:20:46 UTC 2013 - cfarr...@suse.com
+
+- license update: GPL-2.0
+ ÃPresence of many GPL-2.0 licensed files in mplex/ y4mdenoise
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.29sE6C/_old 2013-09-25 14:33:03.0 +0200
+++ /var/tmp/diff_new_pack.29sE6C/_new 2013-09-25 14:33:03.0 +0200
@@ -20,7 +20,7 @@
Version:2.0.0
Release:0
Summary:MJPEG Video Capture and Processing Tools
-License:BSD-3-Clause and GPL-2.0+
+License:GPL-2.0
Group: Productivity/Multimedia/Video/Editors and Convertors
Url:http://mjpeg.sourceforge.net/
%if 0%{?BUILD_ORIG}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2013-03-11 09:51:25
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is mjpegtools, Maintainer is vdziewie...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2012-07-09
09:51:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2013-03-11 09:51:26.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 1 11:50:08 UTC 2013 - co...@suse.com
+
+- update license to new format
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.LN5A4d/_old 2013-03-11 09:51:27.0 +0100
+++ /var/tmp/diff_new_pack.LN5A4d/_new 2013-03-11 09:51:27.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mjpegtools
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Version:2.0.0
Release:0
Summary:MJPEG Video Capture and Processing Tools
-License:BSD-3-Clause ; GPL-2.0+
+License:BSD-3-Clause and GPL-2.0+
Group: Productivity/Multimedia/Video/Editors and Convertors
Url:http://mjpeg.sourceforge.net/
%if 0%{?BUILD_ORIG}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2012-07-09 09:50:57
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is mjpegtools, Maintainer is vdziewie...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2012-05-21
08:08:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2012-07-09 09:51:03.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul 3 21:51:17 UTC 2012 - meiss...@suse.com
+
+- disable simd-accel on ppc as it does not build with the
+ reduced tarball
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.HVgovi/_old 2012-07-09 09:51:04.0 +0200
+++ /var/tmp/diff_new_pack.HVgovi/_new 2012-07-09 09:51:04.0 +0200
@@ -114,7 +114,11 @@
diff -u mpeg2enc/mpeg2enc.cc* || :
%endif
autoreconf -vfi
-%configure --disable-static --disable-arch_tuning
+EXTRAOPTS=
+%ifarch ppc ppc64
+EXTRAOPTS=--disable-simd-accel
+%endif
+%configure --disable-static --disable-arch_tuning $EXTRAOPTS
make %{?_smp_mflags}
%install
++ mjpegtools-2.0.0-patched.tar.gz ++
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2012-05-21 08:08:48
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is mjpegtools, Maintainer is vdziewie...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2012-03-20
12:11:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2012-05-21 08:08:49.0 +0200
@@ -1,0 +2,6 @@
+Sun May 6 14:35:50 UTC 2012 - reddw...@opensuse.org
+
+- Don't force a libpng version
+- Modify %attr use to make it compatible with old distros
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.7Zlr5F/_old 2012-05-21 08:08:52.0 +0200
+++ /var/tmp/diff_new_pack.7Zlr5F/_new 2012-05-21 08:08:52.0 +0200
@@ -48,7 +48,7 @@
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gtk+-x11-2.0)
BuildRequires: pkgconfig(libdv)
-BuildRequires: pkgconfig(libpng14)
+BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libquicktime)
%if 0%{?suse_version} = 1210
BuildRequires: pkgconfig(libv4l1)
@@ -140,7 +140,7 @@
%files
%defattr(0644, root, root, 0755)
-%attr(0755,-,-) %{_bindir}/*
+%attr(0755,root,root) %{_bindir}/*
%{_mandir}/man1/*.1%{ext_man}
%{_mandir}/man5/*.5%{ext_man}
%{_infodir}/mjpeg-howto.info%{ext_info}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2012-03-20 12:11:34
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is mjpegtools, Maintainer is vdziewie...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2011-12-08
11:53:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2012-03-20 12:11:36.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 15 19:38:49 UTC 2012 - dims...@opensuse.org
+
+- Add mjpegtools-gcc47.patch: Fix build with gcc 4.7.
+
+---
New:
mjpegtools-gcc47.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.rg4mMd/_old 2012-03-20 12:11:37.0 +0100
+++ /var/tmp/diff_new_pack.rg4mMd/_new 2012-03-20 12:11:37.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mjpegtools
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: mjpegtools
Version:2.0.0
Release:0
Summary:MJPEG Video Capture and Processing Tools
-Url:http://mjpeg.sourceforge.net/
+License:BSD-3-Clause ; GPL-2.0+
Group: Productivity/Multimedia/Video/Editors and Convertors
+Url:http://mjpeg.sourceforge.net/
%if 0%{?BUILD_ORIG}
Source0:
http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz
%else
@@ -28,7 +30,6 @@
#%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir}
mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz )
Source0:%{name}-%{version}-patched.tar.gz
%endif
-License:BSD-3-Clause ; GPL-2.0+
Source1:mjpegtools-codecpatch.sh
Patch0: mjpegtools-cpuinfo.patch
Patch1: mjpegtools-vector_alignment.patch
@@ -37,6 +38,7 @@
Patch4: mjpegtools-no_arch_tuning.patch
Patch5: mjpegtools-config_h.patch
Patch6: mjpegtools-v4l-2.6.38.patch
+Patch7: mjpegtools-gcc47.patch
Patch100: mjpegtools-codecpatch.patch
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
@@ -51,8 +53,8 @@
%if 0%{?suse_version} = 1210
BuildRequires: pkgconfig(libv4l1)
%endif
-BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(SDL_gfx)
+BuildRequires: pkgconfig(sdl)
Requires(post): info
Requires(preun): info
@@ -100,6 +102,7 @@
%if 0%{?suse_version} = 1210
%patch6
%endif
+%patch7 -p1
%if ! 0%{?BUILD_ORIG}
# remove references to files removed by %%{name}-codecpatch.sh
%patch100
++ mjpegtools-2.0.0-patched.tar.gz ++
++ mjpegtools-gcc47.patch ++
Index: mjpegtools-2.0.0/y4mdenoise/MotionSearcher.hh
===
--- mjpegtools-2.0.0.orig/y4mdenoise/MotionSearcher.hh
+++ mjpegtools-2.0.0/y4mdenoise/MotionSearcher.hh
@@ -2196,7 +2196,7 @@ MotionSearcherPIXEL_NUM,DIM,PIXEL_TOL,P
{
// This region is too small to be bothered with.
// Just get rid of it.
- DeleteRegion (a_pRegion);
+ this-DeleteRegion (a_pRegion);
}
else
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2011-12-08 11:51:22
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is mjpegtools, Maintainer is pu...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2011-11-18
15:46:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2011-12-08 11:53:27.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec 2 12:57:55 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+---
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.okiZim/_old 2011-12-08 11:53:35.0 +0100
+++ /var/tmp/diff_new_pack.okiZim/_new 2011-12-08 11:53:35.0 +0100
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
Name: mjpegtools
Version:2.0.0
Release:0
@@ -30,7 +28,7 @@
#%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir}
mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz )
Source0:%{name}-%{version}-patched.tar.gz
%endif
-License:BSD3c(or similar) ; GPLv2+
+License:BSD-3-Clause ; GPL-2.0+
Source1:mjpegtools-codecpatch.sh
Patch0: mjpegtools-cpuinfo.patch
Patch1: mjpegtools-vector_alignment.patch
@@ -42,6 +40,7 @@
Patch100: mjpegtools-codecpatch.patch
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
+BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: pkgconfig(gdk-x11-2.0)
BuildRequires: pkgconfig(gobject-2.0)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at 2011-11-18 15:45:52
Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old)
and /work/SRC/openSUSE:Factory/.mjpegtools.new (New)
Package is mjpegtools, Maintainer is pu...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes2011-09-23
02:13:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes
2011-11-18 15:46:20.0 +0100
@@ -1,0 +2,9 @@
+Tue Nov 15 02:02:52 UTC 2011 - cmorv...@yahoo.es
+
+- Update to 2.0.0
+- Remove obsoleted patches
+- Rename to follow SLPP
+- Use pkgconfig()-type BuildRequires
+- Spec-clean
+
+---
Old:
mjpegtools-1.9.0-fix-compiler-error.patch
mjpegtools-1.9.0-patched.tar.bz2
mjpegtools-1.9.0.tar.bz2
mjpegtools-fix-invalid-conversion.patch
mjpegtools-fix_init.patch
mjpegtools-fix_lib_versioning-mpeg2enc.patch
mjpegtools-fix_lib_versioning.patch
mjpegtools-jpeg-7.patch
New:
mjpegtools-2.0.0-patched.tar.gz
mjpegtools-2.0.0.tar.gz
mjpegtools-config_h.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.0 +0100
+++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.0 +0100
@@ -15,55 +15,49 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: mjpegtools
-Version:1.9.0
-Release:22
-License:BSD3c(or similar) ; GPLv2+
-Group: Productivity/Multimedia/Video/Editors and Convertors
+Version:2.0.0
+Release:0
Summary:MJPEG Video Capture and Processing Tools
-AutoReqProv:on
Url:http://mjpeg.sourceforge.net/
+Group: Productivity/Multimedia/Video/Editors and Convertors
%if 0%{?BUILD_ORIG}
-Source0:%{name}-%{version}.tar.bz2
+Source0:
http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz
%else
-# FIXME read the comment at the top.
# WARNING: This is not a comment, but a real command to repack souce:
-#%(sh %{_sourcedir}/%{name}-codecpatch.sh %{_sourcedir}
%{name}-%{version}.tar.bz2 %{name}-%{version}-patched.tar.bz2 )
-Source0:%{name}-%{version}-patched.tar.bz2
+#%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir}
mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz )
+Source0:%{name}-%{version}-patched.tar.gz
%endif
+License:BSD3c(or similar) ; GPLv2+
Source1:mjpegtools-codecpatch.sh
Patch0: mjpegtools-cpuinfo.patch
-Patch4: mjpegtools-vector_alignment.patch
-Patch5: mjpegtools-getopt.patch
-Patch6: mjpegtools-writeable_strings.patch
-Patch7: mjpegtools-fix-invalid-conversion.patch
-Patch8: mjpegtools-1.9.0-fix-compiler-error.patch
-Patch9: mjpegtools-jpeg-7.patch
-Patch10:mjpegtools-fix_init.patch
-Patch11:mjpegtools-fix_lib_versioning.patch
-Patch12:mjpegtools-no_arch_tuning.patch
-Patch13:mjpegtools-v4l-2.6.38.patch
-Patch21:mjpegtools-fix_lib_versioning-mpeg2enc.patch
-Patch100: %{name}-codecpatch.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %install_info_prereq
-BuildRequires: SDL-devel
+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
+Patch100: mjpegtools-codecpatch.patch
BuildRequires: gcc-c++
-BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: libquicktime-devel
-BuildRequires: nasm
+BuildRequires: pkg-config
+BuildRequires: pkgconfig(gdk-x11-2.0)
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gtk+-x11-2.0)
+BuildRequires: pkgconfig(libdv)
+BuildRequires: pkgconfig(libpng14)
+BuildRequires: pkgconfig(libquicktime)
%if 0%{?suse_version} = 1210
-BuildRequires: libv4l-devel = 0.8.4
+BuildRequires: pkgconfig(libv4l1)
%endif
-#BuildRequires: gtk1-compat-devel
-#BuildRequires: libmovtar popt-devel
+BuildRequires: pkgconfig(sdl)
+BuildRequires: pkgconfig(SDL_gfx)
+Requires(post): info
+Requires(preun): info
-%define lib_version %(echo %{version}|cut -d. -f1-2)
+%define lib_version %(echo %{version} | cut -d. -f1-2)
%description
The mjpegtools allow for capture, playback, processing, and simple
@@ -72,14 +66,25 @@
zoran-driver package), but the processing tools can be used
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Mon Aug 8 15:06:23 CEST 2011.
--- mjpegtools/mjpegtools.changes 2011-07-07 11:21:33.0 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2011-08-07
18:06:56.0 +0200
@@ -1,0 +2,8 @@
+Sun Aug 7 15:49:23 UTC 2011 - ch...@computersalat.de
+
+- fix BUILD_ORIG
+ o add fix_lib_versioning-mpeg2enc patch (mpeg2enc/Makefile.am)
+- add gtk2-devel (Gtk+ support for glav)
+- remove author from descr
+
+---
calling whatdependson for head-i586
New:
mjpegtools-fix_lib_versioning-mpeg2enc.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.x6ru1n/_old 2011-08-08 15:05:34.0 +0200
+++ /var/tmp/diff_new_pack.x6ru1n/_new 2011-08-08 15:05:34.0 +0200
@@ -19,20 +19,13 @@
Name: mjpegtools
-BuildRequires: SDL-devel gcc-c++ libjpeg-devel libpng-devel
libquicktime-devel nasm
-%if 0%{?suse_version} = 1210
-BuildRequires: libv4l-devel = 0.8.4
-%endif
-#BuildRequires: gtk1-compat-devel
-#BuildRequires: libmovtar popt-devel
-Url:http://mjpeg.sourceforge.net/
+Version:1.9.0
+Release:22
License:BSD3c(or similar) ; GPLv2+
Group: Productivity/Multimedia/Video/Editors and Convertors
-PreReq: %install_info_prereq
-AutoReqProv:on
-Version:1.9.0
-Release:20
Summary:MJPEG Video Capture and Processing Tools
+AutoReqProv:on
+Url:http://mjpeg.sourceforge.net/
%if 0%{?BUILD_ORIG}
Source0:%{name}-%{version}.tar.bz2
%else
@@ -42,7 +35,6 @@
Source0:%{name}-%{version}-patched.tar.bz2
%endif
Source1:mjpegtools-codecpatch.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: mjpegtools-cpuinfo.patch
Patch4: mjpegtools-vector_alignment.patch
Patch5: mjpegtools-getopt.patch
@@ -54,7 +46,22 @@
Patch11:mjpegtools-fix_lib_versioning.patch
Patch12:mjpegtools-no_arch_tuning.patch
Patch13:mjpegtools-v4l-2.6.38.patch
+Patch21:mjpegtools-fix_lib_versioning-mpeg2enc.patch
Patch100: %{name}-codecpatch.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+PreReq: %install_info_prereq
+BuildRequires: SDL-devel
+BuildRequires: gcc-c++
+BuildRequires: gtk2-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libquicktime-devel
+BuildRequires: nasm
+%if 0%{?suse_version} = 1210
+BuildRequires: libv4l-devel = 0.8.4
+%endif
+#BuildRequires: gtk1-compat-devel
+#BuildRequires: libmovtar popt-devel
%define lib_version %(echo %{version}|cut -d. -f1-2)
@@ -65,16 +72,6 @@
zoran-driver package), but the processing tools can be used with MJPEG
data from other sources as well.
-
-
-Authors:
-
-Gernot Ziegler g...@lysator.liu.se
-Rainer Johanni rai...@johanni.de
-Andrew Stevens andrew.stev...@comlab.ox.ac.uk
-Xavier Biquard
-Ronald Bultje
-
%package devel
License:BSD3c(or similar) ; GPLv2+
Group: Development/Libraries/C and C++
@@ -86,21 +83,12 @@
This package contains all files needed to develop code that uses the
mjpegtools libraries.
-
-
-Authors:
-
-Gernot Ziegler g...@lysator.liu.se
-Rainer Johanni rai...@johanni.de
-Andrew Stevens andrew.stev...@comlab.ox.ac.uk
-Xavier Biquard
-Ronald Bultje
-
%prep
%setup -q
%patch0
%if 0%{?BUILD_ORIG}
%patch4 -p1
+%patch21
%endif
%patch5 -p1
%patch6 -p1
@@ -186,6 +174,9 @@
%{_libdir}/liblavplay.so
%{_libdir}/liblavrec.so
%{_libdir}/libmjpegutils.so
+%if 0%{?BUILD_ORIG}
+%{_libdir}/libmpeg2encpp.so
+%endif
%{_libdir}/libmplex2.so
%{_libdir}/pkgconfig/mjpegtools.pc
++ mjpegtools-fix_lib_versioning-mpeg2enc.patch ++
Index: mpeg2enc/Makefile.am
===
--- mpeg2enc/Makefile.am.orig 2008-05-05 16:28:44.0 +0200
+++ mpeg2enc/Makefile.am2011-08-07 17:12:29.0 +0200
@@ -72,9 +72,8 @@
mpeg2syntaxcodes.h imageplanes.hh
libmpeg2encpp_la_LDFLAGS = \
- ${LT_STATIC} \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) ${EXTRA_LDFLAGS}
+ ${LTV_STATIC} \
+ -release $(LTV_RELEASE) ${EXTRA_LDFLAGS}
libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Tue Jul 12 13:56:07 CEST 2011.
--- mjpegtools/mjpegtools.changes 2011-04-15 20:42:39.0 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2011-07-07
11:21:33.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 7 09:10:47 UTC 2011 - idon...@novell.com
+
+- Add mjpegtools-v4l-2.6.38.patch: use the new v4l interface
+
+---
calling whatdependson for head-i586
New:
mjpegtools-v4l-2.6.38.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.smcs20/_old 2011-07-12 13:55:10.0 +0200
+++ /var/tmp/diff_new_pack.smcs20/_new 2011-07-12 13:55:10.0 +0200
@@ -20,6 +20,9 @@
Name: mjpegtools
BuildRequires: SDL-devel gcc-c++ libjpeg-devel libpng-devel
libquicktime-devel nasm
+%if 0%{?suse_version} = 1210
+BuildRequires: libv4l-devel = 0.8.4
+%endif
#BuildRequires: gtk1-compat-devel
#BuildRequires: libmovtar popt-devel
Url:http://mjpeg.sourceforge.net/
@@ -28,7 +31,7 @@
PreReq: %install_info_prereq
AutoReqProv:on
Version:1.9.0
-Release:18
+Release:20
Summary:MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
Source0:%{name}-%{version}.tar.bz2
@@ -50,6 +53,7 @@
Patch10:mjpegtools-fix_init.patch
Patch11:mjpegtools-fix_lib_versioning.patch
Patch12:mjpegtools-no_arch_tuning.patch
+Patch13:mjpegtools-v4l-2.6.38.patch
Patch100: %{name}-codecpatch.patch
%define lib_version %(echo %{version}|cut -d. -f1-2)
@@ -110,6 +114,9 @@
%patch10
%patch11
%patch12
+%if 0%{?suse_version} = 1210
+%patch13 -p1
+%endif
%build
%if 0%{?BUILD_ORIG}
++ mjpegtools-v4l-2.6.38.patch ++
diff -ur mjpegtools-1.9.0.orig/configure.ac mjpegtools-1.9.0/configure.ac
--- mjpegtools-1.9.0.orig/configure.ac 2011-07-07 11:07:45.211089635 +0200
+++ mjpegtools-1.9.0/configure.ac 2011-07-07 11:18:42.513089556 +0200
@@ -155,11 +155,11 @@
have_video4linux=false
case $host in
*-*-linux*)
- AC_CHECK_HEADER(linux/videodev.h,
+ AC_CHECK_HEADER(libv4l1-videodev.h,
[have_video4linux=true
AC_DEFINE(HAVE_V4L, 1,
[Building for Linux - using the video4linux API])],
- [AC_MSG_ERROR([videodev.h not found - please install the
linux kernel headers])])
+ [AC_MSG_ERROR([libv4l1-videodev.h not found - please install
the v4l-utils devel package])])
;;
esac
AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
diff -ur mjpegtools-1.9.0.orig/lavtools/lavvideo.c
mjpegtools-1.9.0/lavtools/lavvideo.c
--- mjpegtools-1.9.0.orig/lavtools/lavvideo.c 2011-07-07 11:07:45.220089635
+0200
+++ mjpegtools-1.9.0/lavtools/lavvideo.c2011-07-07 11:18:27.601089556
+0200
@@ -63,7 +63,7 @@
* 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 videodev_mjpeg.h
#include frequencies.h
diff -ur mjpegtools-1.9.0.orig/lavtools/liblavplay.c
mjpegtools-1.9.0/lavtools/liblavplay.c
--- mjpegtools-1.9.0.orig/lavtools/liblavplay.c 2011-07-07 11:07:45.221089635
+0200
+++ mjpegtools-1.9.0/lavtools/liblavplay.c 2011-07-07 11:16:01.227089575
+0200
@@ -68,7 +68,8 @@
* errors here, check your linux/time.h sys/time.h header setup.
*/
#define _LINUX_TIME_H
-#include linux/videodev.h
+#include libv4l1-videodev.h
+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
#else
#define VIDEO_MODE_PAL 0
#define VIDEO_MODE_NTSC1
diff -ur mjpegtools-1.9.0.orig/lavtools/liblavrec.c
mjpegtools-1.9.0/lavtools/liblavrec.c
--- mjpegtools-1.9.0.orig/lavtools/liblavrec.c 2011-07-07 11:07:45.221089635
+0200
+++ mjpegtools-1.9.0/lavtools/liblavrec.c 2011-07-07 11:16:18.362089573
+0200
@@ -63,7 +63,8 @@
* errors here, check your linux/time.h sys/time.h header setup.
*/
#define _LINUX_TIME_H
-#include linux/videodev.h
+#include libv4l1-videodev.h
+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
#ifdef HAVE_SYS_SOUNDCARD_H
#include sys/soundcard.h
#endif
diff -ur mjpegtools-1.9.0.orig/lavtools/testrec.c
mjpegtools-1.9.0/lavtools/testrec.c
--- mjpegtools-1.9.0.orig/lavtools/testrec.c2011-07-07 11:07:45.220089635
+0200
+++ mjpegtools-1.9.0/lavtools/testrec.c 2011-07-07 11:19:56.128089546 +0200
@@ -89,7 +89,7 @@
* 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/soundcard.h
/* These are explicit prototypes for the compiler, to prepare separation of
audiolib.c */
commit mjpegtools for openSUSE:Factory
Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Mon Apr 4 12:57:40 CEST 2011.
--- mjpegtools/mjpegtools.changes 2010-09-02 16:15:30.0 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2011-02-09
18:14:11.0 +0100
@@ -1,0 +2,20 @@
+Wed Feb 9 18:12:41 CET 2011 - p...@suse.de
+
+- Optimize the handling of CFLAGS.
+- Don't use -fno-strict-aliasing as the compiler doesn't report
+ any aliasing issues.
+
+---
+Wed Feb 9 17:20:30 CET 2011 - p...@suse.de
+
+- Use AC_PREREQ before AC_INIT
+- Move AM_INIT_AUTOMAKE to just after AC_INIT
+- Use LT_INIT to init libtool and pass disable-static as default.
+- Only pass -release to libtool and not -release and -version-info,
+ thus fixing the library naming.
+- Add and use an option to configure to disable processor specific
+ code tuning.
+- Don't bother with patching .in files as they're regenerated by
+ calling autoreconf.
+
+---
calling whatdependson for head-i586
New:
mjpegtools-fix_init.patch
mjpegtools-fix_lib_versioning.patch
mjpegtools-no_arch_tuning.patch
Other differences:
--
++ mjpegtools.spec ++
--- /var/tmp/diff_new_pack.XSyEnk/_old 2011-04-04 12:55:45.0 +0200
+++ /var/tmp/diff_new_pack.XSyEnk/_new 2011-04-04 12:55:45.0 +0200
@@ -28,11 +28,12 @@
PreReq: %install_info_prereq
AutoReqProv:on
Version:1.9.0
-Release:12
+Release:16
Summary:MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
Source0:%{name}-%{version}.tar.bz2
%else
+# FIXME read the comment at the top.
# WARNING: This is not a comment, but a real command to repack souce:
#%(sh %{_sourcedir}/%{name}-codecpatch.sh %{_sourcedir}
%{name}-%{version}.tar.bz2 %{name}-%{version}-patched.tar.bz2 )
Source0:%{name}-%{version}-patched.tar.bz2
@@ -46,8 +47,13 @@
Patch7: mjpegtools-fix-invalid-conversion.patch
Patch8: mjpegtools-1.9.0-fix-compiler-error.patch
Patch9: mjpegtools-jpeg-7.patch
+Patch10:mjpegtools-fix_init.patch
+Patch11:mjpegtools-fix_lib_versioning.patch
+Patch12:mjpegtools-no_arch_tuning.patch
Patch100: %{name}-codecpatch.patch
+%define lib_version %(echo %{version}|cut -d. -f1-2)
+
%description
The mjpegtools allow for capture, playback, processing, and simple
editing of MJPEG AV data. The hardware I/O applications are intended
@@ -67,17 +73,14 @@
%package devel
License:BSD3c(or similar) ; GPLv2+
-Group: Productivity/Multimedia/Video/Editors and Convertors
+Group: Development/Libraries/C and C++
Summary:MJPEG Video Capture and Processing Tools
Requires: %{name} = %{version}
Requires: SDL-devel glibc-devel zlib-devel libdv-devel libjpeg-devel
libquicktime-devel
%description devel
-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 all files needed to develop code that uses the
+mjpegtools libraries.
@@ -104,21 +107,22 @@
# remove references to files removed by %{name}-codecpatch.sh
%patch100 -p1
%endif
-# overwrite cpuinfo.sh, cpu optimization does not make sense
-# when building for a distribution
-echo cpuinfo.sh
+%patch10
+%patch11
+%patch12
%build
%if 0%{?BUILD_ORIG}
sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc
diff -u mpeg2enc/mpeg2enc.cc* || :
%endif
-%ifarch %ix86
- export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing
-%else
- export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC
+CFLAGS=%{optflags}
+CXXFLAGS=%{optflags}
+
+%ifnarch %ix86
+ CFLAGS+= -fPIC
%endif
-export CXXFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing
+export CXXFLAGS CFLAGS
autoreconf -vfi
# disable linking against libmpeg2encpp on ppc architectures
./configure \
@@ -130,7 +134,7 @@
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--disable-warnings_as_errors \
---disable-static
+--disable-arch_tuning
# --with-quicktime=/usr/include/quicktime \
# --with-dv=/usr \
%{__make} %{?jobs:-j%jobs}
@@ -145,6 +149,7 @@
rm -f %{buildroot}%{_mandir}/man1/${app}.*
done
%endif
+rm -f %{buildroot}/%{_libdir}/*.la
%clean
rm -rf %{buildroot}
@@ -161,7 +166,7 @@
%defattr(-,root,root)
%doc AUTHORS CHANGES COPYING ChangeLog HINTS README*
%{_bindir}/*
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*-%{lib_version}.so
%doc %{_mandir}/man1/*.1.gz
%doc %{_mandir}/man5/*.5.gz
%doc %{_infodir}/mjpeg-howto*
@@ -169,8 +174,12 @@
%files devel
