Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Mon Feb 7 12:12:22 CET 2011.
--------
--- mjpegtools/mjpegtools.changes 2011-02-02 20:15:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2010-09-02 16:15:30.000000000 +0200
@@ -2,18 +1,0 @@
-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-2.0.0rc1-patched.tar.bz2
mjpegtools-2.0.0rc1.tar.bz2
mjpegtools-configure.ac.patch
New:
----
mjpegtools-1.9.0-patched.tar.bz2
mjpegtools-1.9.0.tar.bz2
mjpegtools-fix-invalid-conversion.patch
mjpegtools-jpeg-7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mjpegtools.spec ++++++
--- /var/tmp/diff_new_pack.b5GQN4/_old 2011-02-07 12:12:11.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:11.000000000 +0100
@@ -17,15 +17,9 @@
# 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 pkg-config
-BuildRequires: libquicktime-devel nasm xorg-x11-libX11-devel zlib-devel
+BuildRequires: SDL-devel gcc-c++ libjpeg-devel libpng-devel libquicktime-devel nasm
#BuildRequires: gtk1-compat-devel
#BuildRequires: libmovtar popt-devel
Url: http://mjpeg.sourceforge.net/
@@ -33,30 +27,26 @@
Group: Productivity/Multimedia/Video/Editors and Convertors
PreReq: %install_info_prereq
AutoReqProv: on
-Version: 1.99.99
-Release: 1
+Version: 1.9.0
+Release: 12
Summary: MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
-Source0: http://sourceforge.net/projects/mjpeg/files/%{name}/%{srcversion}/%{name}-%{srcversion}.tar.bz2
+Source0: %{name}-%{version}.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}-%{srcversion}-patched.tar.bz2
+Source0: %{name}-%{version}-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
@@ -77,14 +67,10 @@
%package devel
License: BSD3c(or similar) ; GPLv2+
-Group: Development/Libraries/C and C++
+Group: Productivity/Multimedia/Video/Editors and Convertors
Summary: MJPEG Video Capture and Processing Tools
Requires: %{name} = %{version}
-%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
+Requires: SDL-devel glibc-devel zlib-devel libdv-devel libjpeg-devel libquicktime-devel
%description devel
The mjpegtools allow for capture, playback, processing, and simple
@@ -104,19 +90,19 @@
Ronald Bultje
%prep
-%setup -q -n %{name}-%{sdirversion}
+%setup -q
%patch0
%if 0%{?BUILD_ORIG}
%patch4 -p1
%endif
-%patch5
-%patch6
-%patch8
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%if ! 0%{?BUILD_ORIG}
-# remove references to files removed by %%{name}-codecpatch.sh
-%patch100
-# Additional removals for configure.ac and Makefile.am
-%patch101
+# 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
@@ -133,17 +119,18 @@
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
%endif
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-#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
+autoreconf -vfi
# disable linking against libmpeg2encpp on ppc architectures
- --disable-simd-accel
+./configure \
+%ifarch ppc ppc64
+ --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.b5GQN4/_old 2011-02-07 12:12:11.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:11.000000000 +0100
@@ -1,14 +1,20 @@
-Index: y4mdenoise/BitmapRegion2D.hh
-===================================================================
---- y4mdenoise/BitmapRegion2D.hh.orig 2009-06-15 17:25:24.000000000 +0200
-+++ y4mdenoise/BitmapRegion2D.hh 2011-02-02 13:26:03.529612039 +0200
-@@ -1371,6 +1371,12 @@ BitmapRegion2D::IteratorBack
+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::FindLastSetB
{
// Not written yet.
assert (false);
+
+ // Make compiler happy
+ return 0;
+ }
+
+
+@@ -1301,6 +1304,9 @@ BitmapRegion2D::FindLastClea
+ {
+ // Not written yet.
+ assert (false);
+
+ // Make compiler happy
+ return 0;
++++++ mjpegtools-2.0.0rc1-patched.tar.bz2 -> mjpegtools-1.9.0-patched.tar.bz2 ++++++
++++ 285583 lines of diff (skipped)
++++++ mjpegtools-2.0.0rc1-patched.tar.bz2 -> mjpegtools-1.9.0.tar.bz2 ++++++
++++ 318828 lines of diff (skipped)
++++++ mjpegtools-codecpatch.patch ++++++
--- /var/tmp/diff_new_pack.b5GQN4/_old 2011-02-07 12:12:13.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:13.000000000 +0100
@@ -1,8 +1,35 @@
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig 2010-10-03 06:51:46.000000000 +0200
-+++ Makefile.in 2011-02-02 13:26:07.801612459 +0200
-@@ -295,9 +295,7 @@ top_builddir = @top_builddir@
+diff -rp mjpegtools-1.9.0rc2.orig/configure.ac mjpegtools-1.9.0rc2/configure.ac
+*** mjpegtools-1.9.0rc2.orig/configure.ac 2007-02-26 18:05:38.000000000 +0100
+--- mjpegtools-1.9.0rc2/configure.ac 2007-08-09 17:40:30.241647704 +0200
+*************** AC_CONFIG_FILES([
+*** 559,566 ****
+ y4munsharp/Makefile
+ y4mutils/Makefile
+ yuvfilters/Makefile
+- mpeg2enc/Makefile
+- aenc/Makefile
+ mplex/Makefile
+ scripts/Makefile
+ utils/Makefile
+--- 559,564 ----
+diff -rp mjpegtools-1.9.0rc2.orig/Makefile.am mjpegtools-1.9.0rc2/Makefile.am
+*** mjpegtools-1.9.0rc2.orig/Makefile.am 2006-06-01 19:09:25.000000000 +0200
+--- mjpegtools-1.9.0rc2/Makefile.am 2007-08-09 17:40:15.590874960 +0200
+***************
+*** 10,18 ****
+
+ SUBDIRS = \
+ utils \
+- mpeg2enc \
+ lavtools \
+- aenc \
+ mplex \
+ scripts \
+ docs \
+--- 10,16 ----
+*** mjpegtools-1.9.0rc2.orig/Makefile.in 2007-03-04 16:11:53.000000000 +0100
+--- mjpegtools-1.9.0rc2/Makefile.in 2007-08-09 17:40:03.788669168 +0200
+@@ -245,9 +245,7 @@
top_srcdir = @top_srcdir@
SUBDIRS = \
utils \
++++++ mjpegtools-codecpatch.sh ++++++
--- /var/tmp/diff_new_pack.b5GQN4/_old 2011-02-07 12:12:13.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:13.000000000 +0100
@@ -10,8 +10,8 @@
trap "rm -vrf \"$TMPDIR\" \"${1}/${2}\"" ERR
cd $TMPDIR
tar -xjf "${1}/${2}"
- rm -Rf mjpegtools-2.0.0/{aenc,mpeg2enc}
- tar -cjf "${1}/${3}" mjpegtools-2.0.0
+ rm -Rf mjpegtools-1.9.0/{aenc,mpeg2enc}
+ tar -cjf "${1}/${3}" mjpegtools-1.9.0
cd - 1>/dev/null
rm -Rf $TMPDIR
else
++++++ mjpegtools-cpuinfo.patch ++++++
--- /var/tmp/diff_new_pack.b5GQN4/_old 2011-02-07 12:12:13.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:13.000000000 +0100
@@ -1,8 +1,6 @@
-Index: cpuinfo.sh
-===================================================================
---- cpuinfo.sh.orig 2009-09-01 18:44:53.000000000 +0200
-+++ cpuinfo.sh 2011-02-02 13:19:54.075624936 +0200
-@@ -91,6 +91,7 @@ _mmx2=no
+--- cpuinfo.sh
++++ cpuinfo.sh
+@@ -91,6 +91,7 @@
_sse=no
_sse2=no
_mtrr=no
@@ -10,7 +8,7 @@
for i in $pparam ; do
case "$i" in
-@@ -101,6 +102,7 @@ for i in $pparam ; do
+@@ -101,6 +102,7 @@
mtrr|k6_mtrr|cyrix_arr) _mtrr=yes ;;
xmm|sse|kni) _sse=yes _mmx2=yes ;;
sse2) _sse2=yes ;;
@@ -18,9 +16,9 @@
esac
done
-@@ -178,8 +180,13 @@ case "$pvendor" in
+@@ -171,8 +173,13 @@
else
- proc=i686
+ proc=i686
fi
- ;;
- 15) proc=pentium4
++++++ mjpegtools-fix-invalid-conversion.patch ++++++
--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig 2009-05-27 01:31:46.000000000 -0700
+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-05-27 01:33:09.000000000 -0700
@@ -53,7 +53,7 @@
bool LPCMStream::Probe(IBitStream &bs )
{
- char *last_dot = strrchr( bs.StreamName(), '.' );
+ const char *last_dot = strrchr( bs.StreamName(), '.' );
return
last_dot != NULL
&& strcmp( last_dot+1, "lpcm") == 0;
++++++ mjpegtools-getopt.patch ++++++
--- /var/tmp/diff_new_pack.b5GQN4/_old 2011-02-07 12:12:13.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:13.000000000 +0100
@@ -3,24 +3,20 @@
yuvdeinterlace/yuvdeinterlace.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: y4mdenoise/main.c
-===================================================================
---- y4mdenoise/main.c.orig 2010-10-10 14:16:25.000000000 +0200
-+++ y4mdenoise/main.c 2011-02-02 13:20:07.881611757 +0200
-@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
+--- a/y4mdenoise/main.c
++++ b/y4mdenoise/main.c
+@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
void
process_commandline(int argc, char *argv[])
{
- char c;
+ int c;
- while ((c = getopt (argc, argv, "h?z:Z:t:T:r:R:m:M:f:BI:p:v:")) != -1)
+ while ((c = getopt (argc, argv, "h?z:Z:t:T:r:R:m:M:f:BI:p:v:i:")) != -1) // HACK
{
-Index: yuvdeinterlace/yuvdeinterlace.cc
-===================================================================
---- yuvdeinterlace/yuvdeinterlace.cc.orig 2010-01-06 18:34:18.000000000 +0200
-+++ yuvdeinterlace/yuvdeinterlace.cc 2011-02-02 13:20:07.883610777 +0200
-@@ -923,7 +923,7 @@ main (int argc, char *argv[])
+--- a/yuvdeinterlace/yuvdeinterlace.cc
++++ b/yuvdeinterlace/yuvdeinterlace.cc
+@@ -845,7 +845,7 @@ main (int argc, char *argv[])
deinterlacer YUVdeint;
++++++ mjpegtools-jpeg-7.patch ++++++
diff -r -u mjpegtools-1.9.0/lavtools/jpegutils.c mjpegtools-1.9.0-r1/lavtools/jpegutils.c
--- mjpegtools-1.9.0/lavtools/jpegutils.c 2005-10-02 13:48:44.000000000 -0500
+++ mjpegtools-1.9.0-r1/lavtools/jpegutils.c 2010-01-23 00:16:02.000000000 -0600
@@ -502,6 +502,7 @@
jpeg_read_header (&dinfo, TRUE);
dinfo.raw_data_out = TRUE;
+ dinfo.do_fancy_upsampling = FALSE;
dinfo.out_color_space = JCS_YCbCr;
dinfo.dct_method = JDCT_IFAST;
guarantee_huff_tables(&dinfo);
@@ -599,6 +600,7 @@
if (field > 0) {
jpeg_read_header (&dinfo, TRUE);
dinfo.raw_data_out = TRUE;
+ dinfo.do_fancy_upsampling = FALSE;
dinfo.out_color_space = JCS_YCbCr;
dinfo.dct_method = JDCT_IFAST;
jpeg_start_decompress (&dinfo);
++++++ mjpegtools-writeable_strings.patch ++++++
--- /var/tmp/diff_new_pack.b5GQN4/_old 2011-02-07 12:12:13.000000000 +0100
+++ /var/tmp/diff_new_pack.b5GQN4/_new 2011-02-07 12:12:13.000000000 +0100
@@ -1,8 +1,6 @@
-Index: utils/motionsearch.h
-===================================================================
---- utils/motionsearch.h.orig 2007-08-09 13:50:04.000000000 +0200
-+++ utils/motionsearch.h 2011-02-02 13:25:51.113612237 +0200
-@@ -124,7 +124,7 @@ extern void (*psubsample_image) (uint8_t
+--- mjpegtools-1.9.0rc3/utils/motionsearch.h.fix 2008-06-25 11:12:55.000000000 +0200
++++ mjpegtools-1.9.0rc3/utils/motionsearch.h 2008-06-25 11:13:45.000000000 +0200
+@@ -124,7 +124,7 @@
extern "C" {
#endif
@@ -11,11 +9,9 @@
int round_search_radius( int radius );
#ifdef __cplusplus
-Index: utils/motionsearch.c
-===================================================================
---- utils/motionsearch.c.orig 2007-01-03 20:29:10.000000000 +0200
-+++ utils/motionsearch.c 2011-02-02 13:25:51.114613689 +0200
-@@ -1021,7 +1021,7 @@ if (!strcmp(#x, name) && simd_name_ok( n
+--- mjpegtools-1.9.0rc3/utils/motionsearch.c.fix 2008-06-25 11:12:50.000000000 +0200
++++ mjpegtools-1.9.0rc3/utils/motionsearch.c 2008-06-25 11:13:33.000000000 +0200
+@@ -1021,7 +1021,7 @@
p##x = x; \
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org