[libkdcraw/f17] more correct patch

Kevin Kofler kkofler at fedoraproject.org
Sat Mar 9 23:06:35 UTC 2013


commit 65c47f35bd31e33b75381daba1b12a7c6b863be1
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Mar 10 00:06:21 2013 +0100

    more correct patch
    
    This shouldn't make a difference for us, but still.

 libkdcraw-4.10.0-libjpeg-turbo.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libkdcraw-4.10.0-libjpeg-turbo.patch b/libkdcraw-4.10.0-libjpeg-turbo.patch
index 9f3a2e9..27ef5a3 100644
--- a/libkdcraw-4.10.0-libjpeg-turbo.patch
+++ b/libkdcraw-4.10.0-libjpeg-turbo.patch
@@ -75,12 +75,12 @@ diff -Nur libkdcraw-4.10.0/libraw/RawSpeed/rawspeed.jpeg-version.patch libkdcraw
 + static void init_source (j_decompress_ptr cinfo) {}
 diff -Nur libkdcraw-4.10.0/libraw/src/libraw_datastream.cpp libkdcraw-4.10.0-libjpeg-turbo/libraw/src/libraw_datastream.cpp
 --- libkdcraw-4.10.0/libraw/src/libraw_datastream.cpp	2013-01-23 23:00:44.000000000 +0100
-+++ libkdcraw-4.10.0-libjpeg-turbo/libraw/src/libraw_datastream.cpp	2013-03-09 23:55:06.000000000 +0100
++++ libkdcraw-4.10.0-libjpeg-turbo/libraw/src/libraw_datastream.cpp	2013-03-10 00:04:54.000000000 +0100
 @@ -443,9 +443,52 @@
  #endif
  }
  
-+#ifndef USE_JPEG8
++#if !defined(NO_JPEG) && !defined(USE_JPEG8)
 +/* Read JPEG image from a memory segment
 +   (from libraw/RawSpeed/DngDecoderSlices.cpp, LGPLv2+) */
 +


More information about the scm-commits mailing list