[libkdcraw] rebase libjpeg-turbo patch
Kevin Kofler
kkofler at fedoraproject.org
Fri Jun 28 22:47:20 UTC 2013
commit 5393f8566a7804b8017179e3cc932001e3707e53
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Jun 29 00:46:28 2013 +0200
rebase libjpeg-turbo patch
* Fri Jun 28 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.10.90-2
- rebase libjpeg-turbo patch
....patch => libkdcraw-4.10.90-libjpeg-turbo.patch | 37 +++++++++----------
libkdcraw.spec | 10 +++--
2 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/libkdcraw-4.10.0-libjpeg-turbo.patch b/libkdcraw-4.10.90-libjpeg-turbo.patch
similarity index 73%
rename from libkdcraw-4.10.0-libjpeg-turbo.patch
rename to libkdcraw-4.10.90-libjpeg-turbo.patch
index 7cd2777..d8232a6 100644
--- a/libkdcraw-4.10.0-libjpeg-turbo.patch
+++ b/libkdcraw-4.10.90-libjpeg-turbo.patch
@@ -1,7 +1,7 @@
-diff -Nur libkdcraw-4.10.0/libraw/CMakeLists.txt libkdcraw-4.10.0-libjpeg-turbo/libraw/CMakeLists.txt
---- libkdcraw-4.10.0/libraw/CMakeLists.txt 2013-01-23 23:00:43.000000000 +0100
-+++ libkdcraw-4.10.0-libjpeg-turbo/libraw/CMakeLists.txt 2013-03-09 23:58:25.000000000 +0100
-@@ -88,29 +88,26 @@
+diff -Nur libkdcraw-4.10.90/libraw/CMakeLists.txt libkdcraw-4.10.90-libjpeg-turbo/libraw/CMakeLists.txt
+--- libkdcraw-4.10.90/libraw/CMakeLists.txt 2013-06-10 20:53:21.000000000 +0200
++++ libkdcraw-4.10.90-libjpeg-turbo/libraw/CMakeLists.txt 2013-06-29 00:37:31.000000000 +0200
+@@ -88,28 +88,26 @@
FIND_PACKAGE(JPEG)
IF(JPEG_FOUND)
@@ -15,7 +15,6 @@ diff -Nur libkdcraw-4.10.0/libraw/CMakeLists.txt libkdcraw-4.10.0-libjpeg-turbo/
- TRY_COMPILE(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file}
- CMAKE_FLAGS "${_jpeglib_version_include_dirs}"
-- COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var
- )
- IF(_jpeglib_version_compile_result)
- MESSAGE(STATUS "Identified libjpeg version less than 80 (too low)")
@@ -44,21 +43,21 @@ diff -Nur libkdcraw-4.10.0/libraw/CMakeLists.txt libkdcraw-4.10.0-libjpeg-turbo/
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
ENDIF()
-diff -Nur libkdcraw-4.10.0/libraw/RawSpeed/DngDecoderSlices.cpp libkdcraw-4.10.0-libjpeg-turbo/libraw/RawSpeed/DngDecoderSlices.cpp
---- libkdcraw-4.10.0/libraw/RawSpeed/DngDecoderSlices.cpp 2013-01-23 23:00:43.000000000 +0100
-+++ libkdcraw-4.10.0-libjpeg-turbo/libraw/RawSpeed/DngDecoderSlices.cpp 2013-03-09 23:48:29.000000000 +0100
+diff -Nur libkdcraw-4.10.90/libraw/RawSpeed/DngDecoderSlices.cpp libkdcraw-4.10.90-libjpeg-turbo/libraw/RawSpeed/DngDecoderSlices.cpp
+--- libkdcraw-4.10.90/libraw/RawSpeed/DngDecoderSlices.cpp 2013-06-10 20:53:21.000000000 +0200
++++ libkdcraw-4.10.90-libjpeg-turbo/libraw/RawSpeed/DngDecoderSlices.cpp 2013-06-29 00:39:27.000000000 +0200
@@ -88,7 +88,7 @@
}
-#if JPEG_LIB_VERSION < 80
+#ifndef USE_JPEG8
- /* Read JPEG image from a memory segment */
- static void init_source (j_decompress_ptr cinfo) {}
-diff -Nur libkdcraw-4.10.0/libraw/RawSpeed/rawspeed.jpeg-version.patch libkdcraw-4.10.0-libjpeg-turbo/libraw/RawSpeed/rawspeed.jpeg-version.patch
---- libkdcraw-4.10.0/libraw/RawSpeed/rawspeed.jpeg-version.patch 1970-01-01 01:00:00.000000000 +0100
-+++ libkdcraw-4.10.0-libjpeg-turbo/libraw/RawSpeed/rawspeed.jpeg-version.patch 2013-03-09 23:48:29.000000000 +0100
+ #define JPEG_MEMSRC(A,B,C) jpeg_mem_src_int(A,B,C)
+ /* Read JPEG image from a memory segment */
+diff -Nur libkdcraw-4.10.90/libraw/RawSpeed/rawspeed.jpeg-version.patch libkdcraw-4.10.90-libjpeg-turbo/libraw/RawSpeed/rawspeed.jpeg-version.patch
+--- libkdcraw-4.10.90/libraw/RawSpeed/rawspeed.jpeg-version.patch 1970-01-01 01:00:00.000000000 +0100
++++ libkdcraw-4.10.90-libjpeg-turbo/libraw/RawSpeed/rawspeed.jpeg-version.patch 2013-06-29 00:41:32.000000000 +0200
@@ -0,0 +1,13 @@
+diff --git a/RawSpeed/DngDecoderSlices.cpp b/RawSpeed/DngDecoderSlices.cpp
+index 28a137e..617b4b3 100644
@@ -70,13 +69,13 @@ diff -Nur libkdcraw-4.10.0/libraw/RawSpeed/rawspeed.jpeg-version.patch libkdcraw
+
+-#if JPEG_LIB_VERSION < 80
++#ifndef USE_JPEG8
-+ /* Read JPEG image from a memory segment */
+
-+ 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-10 00:22:15.000000000 +0100
-@@ -443,9 +443,52 @@
++ #define JPEG_MEMSRC(A,B,C) jpeg_mem_src_int(A,B,C)
++ /* Read JPEG image from a memory segment */
+diff -Nur libkdcraw-4.10.90/libraw/src/libraw_datastream.cpp libkdcraw-4.10.90-libjpeg-turbo/libraw/src/libraw_datastream.cpp
+--- libkdcraw-4.10.90/libraw/src/libraw_datastream.cpp 2013-06-10 20:53:21.000000000 +0200
++++ libkdcraw-4.10.90-libjpeg-turbo/libraw/src/libraw_datastream.cpp 2013-06-29 00:26:16.000000000 +0200
+@@ -468,9 +468,52 @@
#endif
}
diff --git a/libkdcraw.spec b/libkdcraw.spec
index ecdcec5..a934946 100644
--- a/libkdcraw.spec
+++ b/libkdcraw.spec
@@ -1,7 +1,7 @@
Name: libkdcraw
Summary: A C++ interface around LibRaw library
Version: 4.10.90
-Release: 1%{?dist}
+Release: 2%{?dist}
# libkdcraw is GPLv2+,
# LibRaw(bundled) is LGPLv2
@@ -17,7 +17,7 @@ URL: https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
# fix libjpeg detection for libjpeg-turbo, hopefully upstreamable
# (the hack to add jpeg_mem_src from RawSpeed to LibRaw might not be though)
-Patch50: libkdcraw-4.10.0-libjpeg-turbo.patch
+Patch50: libkdcraw-4.10.90-libjpeg-turbo.patch
BuildRequires: kdelibs4-devel
%if 0%{?fedora} > 17
@@ -57,8 +57,7 @@ Requires: kdelibs4-devel
%prep
%setup -q
-# TODO: rebase? -- rex
-#patch50 -p1 -b .libjpeg-turbo
+%patch50 -p1 -b .libjpeg-turbo
# copy/rename a few things for easier inclusion as %%doc
cp -a libraw/README README.libraw
@@ -116,6 +115,9 @@ fi
%changelog
+* Fri Jun 28 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.10.90-2
+- rebase libjpeg-turbo patch
+
* Thu Jun 27 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.90-1
- 4.10.90
More information about the scm-commits
mailing list