From ddb36cbaaac104bf91d7fdc3b712c5fc94f9a72f1116261a86622ce91133131a Mon Sep 17 00:00:00 2001
From: Petr Uzel <puzel@suse.com>
Date: Tue, 9 Nov 2010 15:29:43 +0000
Subject: [PATCH] add libquicktime-jpeg7.patch (bnc#647859)

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=11
---
 libquicktime-1.1.4.tar.bz2 |  3 ---
 libquicktime-1.1.5.tar.bz2 |  3 +++
 libquicktime-jpeg7.patch   | 34 ++++++++++++++++++++++++++++++++++
 libquicktime.changes       | 12 ++++++++++++
 libquicktime.spec          |  6 ++++--
 ready                      |  0
 6 files changed, 53 insertions(+), 5 deletions(-)
 delete mode 100644 libquicktime-1.1.4.tar.bz2
 create mode 100644 libquicktime-1.1.5.tar.bz2
 create mode 100644 libquicktime-jpeg7.patch
 delete mode 100644 ready

diff --git a/libquicktime-1.1.4.tar.bz2 b/libquicktime-1.1.4.tar.bz2
deleted file mode 100644
index 150b8a3..0000000
--- a/libquicktime-1.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dcceafcb91218e64dcc1ea6dac4139d2364669acf9b9f91430733fe66329e4e9
-size 775567
diff --git a/libquicktime-1.1.5.tar.bz2 b/libquicktime-1.1.5.tar.bz2
new file mode 100644
index 0000000..53fd14f
--- /dev/null
+++ b/libquicktime-1.1.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b42941b997619d9088f21bcc363e0bd8135c7a79b707fca4a6ae4e01bcd3a89
+size 776371
diff --git a/libquicktime-jpeg7.patch b/libquicktime-jpeg7.patch
new file mode 100644
index 0000000..cc694cc
--- /dev/null
+++ b/libquicktime-jpeg7.patch
@@ -0,0 +1,34 @@
+Index: plugins/mjpeg/libmjpeg.c
+===================================================================
+--- plugins/mjpeg/libmjpeg.c.orig
++++ plugins/mjpeg/libmjpeg.c
+@@ -479,6 +479,9 @@ static void new_jpeg_objects(mjpeg_compr
+   /* Ideally the error handler would be set here but it must be called in a thread */
+   jpeg_create_decompress(&(engine->jpeg_decompress));
+   engine->jpeg_decompress.raw_data_out = TRUE;
++#if JPEG_LIB_VERSION >= 70
++  engine->jpeg_decompress.do_fancy_upsampling = FALSE;
++#endif
+   engine->jpeg_decompress.dct_method = JDCT_IFAST;
+   }
+ 
+@@ -665,6 +668,9 @@ static void decompress_field(mjpeg_compr
+   
+   // Reset by jpeg_read_header
+   engine->jpeg_decompress.raw_data_out = TRUE;
++#if JPEG_LIB_VERSION >= 70
++  engine->jpeg_decompress.do_fancy_upsampling = FALSE;
++#endif
+   jpeg_start_decompress(&engine->jpeg_decompress);
+ 
+   // Generate colormodel from jpeg sampling
+@@ -786,6 +792,9 @@ static mjpeg_compressor* mjpeg_new_compr
+   result->jpeg_compress.in_color_space = JCS_RGB;
+   jpeg_set_quality(&(result->jpeg_compress), mjpeg->quality, 0);
+ 
++#if JPEG_LIB_VERSION >= 70
++  result->jpeg_compress.do_fancy_downsampling = FALSE;
++#endif
+   if(mjpeg->use_float) 
+     result->jpeg_compress.dct_method = JDCT_FLOAT;
+   else
diff --git a/libquicktime.changes b/libquicktime.changes
index 4efa1d7..fae0a7a 100644
--- a/libquicktime.changes
+++ b/libquicktime.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Nov  3 16:29:57 UTC 2010 - puzel@novell.com
+
+- add libquicktime-jpeg7.patch (bnc#647859)
+  - patch by Martin Wilck
+
+-------------------------------------------------------------------
+Fri Feb 26 11:40:10 UTC 2010 - puzel@novell.com
+
+- update to libquicktime-1.1.5 
+  - encoding of AC3 and H.264 in AVI and some minor fixes
+
 -------------------------------------------------------------------
 Fri Jan  8 07:53:04 UTC 2010 - puzel@novell.com
 
diff --git a/libquicktime.spec b/libquicktime.spec
index 893aed4..f9aeb73 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libquicktime (Version 1.1.4)
+# spec file for package libquicktime (Version 1.1.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -33,11 +33,12 @@ BuildRequires:  fdupes
 License:        LGPLv2.1+
 Group:          Development/Languages/C and C++
 AutoReqProv:    on
-Version:        1.1.4
+Version:        1.1.5
 Release:        1
 Url:            http://libquicktime.sf.net
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         %{name}-1.0.3-dont_disable_deprecated.patch
+Patch2:         libquicktime-jpeg7.patch	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Library for Reading and Writing Quicktime Movie Files
 Provides:       quicktime4linux
@@ -69,6 +70,7 @@ from quicktime4linux
 # fix brokem links in API docs
 sed -r 's/"(building|codecs|index|license|opening|positioning|reading|util|writing).html/"qt4l_&/' -i `find doc -type f`
 %patch1 -p1
+%patch2 -p0	
 
 %build
 autoreconf -f -i -v
diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000