Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Thu Feb 3 01:46:51 CET 2011.
--------
--- mjpegtools/mjpegtools.changes 2010-09-02 16:15:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2011-02-02 20:15:50.000000000 +0100
@@ -1,0 +2,18 @@
+Wed Feb 2 19:03:20 UTC 2011 - davejplater@gmail.com
+
+- Update to version 2.0.0rc1 named 1.99.99 to enable a clean
+ update to 2.0.0 final.
+- Removed Patches mjpegtools-fix-invalid-conversion.patch and
+ mjpegtools-jpeg-7.patch now in upstream
+- Created patch mjpegtools-configure.ac.patch to compliment
+ the patched source and fix two definitions in yuvdenoise/main.c
+ will be reported upstream.
+- Upstream changes :
+ *I have put the release candidate for the next mjpegtools
+ version online. The next release will be 2.0.0 because the
+ mjpegtools are alreaddy 10 years on Sourceforge, and so we
+ start into our 2nd decade. Because of that the Major release
+ number changed to 2. Check out the new version and report your
+ experience.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mjpegtools-1.9.0-patched.tar.bz2
mjpegtools-1.9.0.tar.bz2
mjpegtools-fix-invalid-conversion.patch
mjpegtools-jpeg-7.patch
New:
----
mjpegtools-2.0.0rc1-patched.tar.bz2
mjpegtools-2.0.0rc1.tar.bz2
mjpegtools-configure.ac.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mjpegtools.spec ++++++
--- /var/tmp/diff_new_pack.Nuvimb/_old 2011-02-03 01:45:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Nuvimb/_new 2011-02-03 01:45:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package mjpegtools (Version 1.9.0)
+# spec file for package mjpegtools
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -17,9 +17,15 @@
# norootforbuild
+# srcversion is for the tarball name
+%define srcversion 2.0.0rc1
+# sdirversion is the directory in the tarball for setup
+# If only the developer could try packaging this version 1.99.99 is because 2.0.0 = 2.0.0 and 2.0.0rc1 > 2.0.0 the stated version of next release.
+%define sdirversion 2.0.0
Name: mjpegtools
-BuildRequires: SDL-devel gcc-c++ libjpeg-devel libpng-devel libquicktime-devel nasm
+BuildRequires: SDL-devel gcc-c++ libjpeg-devel libpng-devel pkg-config
+BuildRequires: libquicktime-devel nasm xorg-x11-libX11-devel zlib-devel
#BuildRequires: gtk1-compat-devel
#BuildRequires: libmovtar popt-devel
Url: http://mjpeg.sourceforge.net/
@@ -27,26 +33,30 @@
Group: Productivity/Multimedia/Video/Editors and Convertors
PreReq: %install_info_prereq
AutoReqProv: on
-Version: 1.9.0
-Release: 11
+Version: 1.99.99
+Release: 1
Summary: MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://sourceforge.net/projects/mjpeg/files/%{name}/%{srcversion}/%{name}-%{srcversion}.tar.bz2
%else
+# TODO WARNING TODO WARNING read the TODO at the top before you TODO anything else to this package.
# 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
+Source0: %{name}-%{srcversion}-patched.tar.bz2
%endif
Source1: mjpegtools-codecpatch.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: mjpegtools-cpuinfo.patch
+%if 0%{?BUILD_ORIG}
+# I haven't touched this patch at version 2.0.0rc1
Patch4: mjpegtools-vector_alignment.patch
+%endif
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
Patch100: %{name}-codecpatch.patch
+# Additional removals for configure.ac and Makefile.am
+Patch101: mjpegtools-configure.ac.patch
%description
The mjpegtools allow for capture, playback, processing, and simple
@@ -67,10 +77,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
+%if 0%{?suse_version} >= 1140
+Requires: libSDL-devel xorg-x11-libX11-devel glibc-devel zlib-devel libdv-devel libjpeg62-devel libquicktime-devel
+%else
+Requires: SDL-devel glibc-devel zlib-devel libdv-devel libjpeg-devel xorg-x11-libX11-devel libquicktime-devel
+%endif
%description devel
The mjpegtools allow for capture, playback, processing, and simple
@@ -90,19 +104,19 @@
Ronald Bultje
%prep
-%setup -q
+%setup -q -n %{name}-%{sdirversion}
%patch0
%if 0%{?BUILD_ORIG}
%patch4 -p1
%endif
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch5
+%patch6
+%patch8
%if ! 0%{?BUILD_ORIG}
-# remove references to files removed by %{name}-codecpatch.sh
-%patch100 -p1
+# remove references to files removed by %%{name}-codecpatch.sh
+%patch100
+# Additional removals for configure.ac and Makefile.am
+%patch101
%endif
# overwrite cpuinfo.sh, cpu optimization does not make sense
# when building for a distribution
@@ -119,18 +133,17 @@
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
%endif
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-autoreconf -vfi
-# disable linking against libmpeg2encpp on ppc architectures
-./configure \
+#autoreconf -vfi
+find ./ -name Makefile.in -delete
+rm -rf configure missing missing_M4 config.* autom4te.cache
+./autogen.sh
+%configure \
+ --disable-static \
+ --disable-warnings_as_errors
%ifarch ppc ppc64
- --disable-simd-accel \
+# disable linking against libmpeg2encpp on ppc architectures
+ --disable-simd-accel
%endif
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --disable-warnings_as_errors \
- --disable-static
# --with-quicktime=/usr/include/quicktime \
# --with-dv=/usr \
%{__make} %{?jobs:-j%jobs}
++++++ mjpegtools-1.9.0-fix-compiler-error.patch ++++++
--- /var/tmp/diff_new_pack.Nuvimb/_old 2011-02-03 01:45:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Nuvimb/_new 2011-02-03 01:45:34.000000000 +0100
@@ -1,20 +1,14 @@
-diff -up mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh.orig mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh
---- mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh.orig 2010-03-01 17:45:22.000000000 +0100
-+++ mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh 2010-03-01 17:45:58.000000000 +0100
-@@ -1289,6 +1289,9 @@ BitmapRegion2D