[libkdcraw] fix jpeg_mem_src check to add the required #includes

Kevin Kofler kkofler at fedoraproject.org
Wed Feb 6 18:08:35 UTC 2013


commit c47c15ff2762ab477f8023e1c0653b1359776294
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Feb 6 19:08:06 2013 +0100

    fix jpeg_mem_src check to add the required #includes
    
    jpeglib.h doesn't include stddef.h and stdio.h, but needs them.

 libkdcraw-4.10.0-libjpeg-turbo.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libkdcraw-4.10.0-libjpeg-turbo.patch b/libkdcraw-4.10.0-libjpeg-turbo.patch
index c3f73f2..96ed83b 100644
--- a/libkdcraw-4.10.0-libjpeg-turbo.patch
+++ b/libkdcraw-4.10.0-libjpeg-turbo.patch
@@ -1,5 +1,5 @@
-From 52109515b6647e7e658b3914dfd041d44f204734 Mon Sep 17 00:00:00 2001
-Message-Id: <52109515b6647e7e658b3914dfd041d44f204734.1360168959.git.kevin.kofler at chello.at>
+From 68ddf3f752956247f58e11be76f7518f7566e343 Mon Sep 17 00:00:00 2001
+Message-Id: <68ddf3f752956247f58e11be76f7518f7566e343.1360173442.git.kevin.kofler at chello.at>
 From: Kevin Kofler <kevin.kofler at chello.at>
 Date: Wed, 6 Feb 2013 17:11:58 +0100
 Subject: [PATCH] fix libjpeg detection for libjpeg-turbo
@@ -19,7 +19,7 @@ error.
  3 Dateien geändert, 29 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
 
 diff --git a/libraw/CMakeLists.txt b/libraw/CMakeLists.txt
-index 581e7b1..598aa31 100644
+index 581e7b1..e83b134 100644
 --- a/libraw/CMakeLists.txt
 +++ b/libraw/CMakeLists.txt
 @@ -88,28 +88,29 @@ ENDIF (ENABLE_LCMS2)
@@ -46,7 +46,7 @@ index 581e7b1..598aa31 100644
 +    LIST(APPEND CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
 +    SET(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
 +    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "${JPEG_LIBRARY}")
-+    CHECK_SYMBOL_EXISTS(jpeg_mem_src jpeglib.h HAVE_JPEG_MEM_SRC)
++    CHECK_SYMBOL_EXISTS(jpeg_mem_src "stddef.h;stdio.h;jpeglib.h" HAVE_JPEG_MEM_SRC)
 +    SET(CMAKE_REQUIRED_INCLUDES "${OLD_CMAKE_REQUIRED_INCLUDES}")
 +    SET(CMAKE_REQUIRED_LIBRARIES "${OLD_CMAKE_REQUIRED_LIBRARIES}")
 +


More information about the scm-commits mailing list