[patch] A cleaner and more portable version of the libraw patch

shotwell-0.7.1-libraw.patch (text/plain), 1.64 KB, created by corec on 2010-09-04 07:16:53 UTC

Index: libraw-config
===================================================================
--- libraw-config	(revision 2143)
+++ libraw-config	(working copy)
@@ -30,7 +30,7 @@
 }
 
 cflags() {
-    if pkg-config --silence-errors --cflags libraw; then
+    if pkg-config --silence-errors --cflags libraw_r; then
         :
     elif [ $1 ]; then
         printf "%cDLIBRAW_NODLL " "-"
@@ -42,7 +42,7 @@
 }
 
 libs() {
-    if pkg-config --silence-errors --libs libraw; then
+    if pkg-config --silence-errors --libs libraw_r; then
         :
     elif [ $1 ]; then
         printf "%clraw_r %clstdc++ %clwsock32 " "-" "-" "-"
@@ -55,7 +55,7 @@
 
 # TODO: Cannot check version of library if no .pc file installed.
 exists() {
-    if pkg-config --silence-errors --exists 'libraw >= $3'; then
+    if pkg-config --silence-errors --exists 'libraw_r >= $3'; then
         :
     elif ! searchpath $LIB_DIRS "libraw_r.a" || ! searchpath $HEADER_DIRS "libraw/libraw.h"; then
         printf "\nPackage libraw not found\n"
Index: Makefile
===================================================================
--- Makefile	(revision 2143)
+++ Makefile	(working copy)
@@ -135,7 +135,7 @@
 	FixedKeyFile.vapi \
 	ExtendedPosix.vapi \
 	LConv.vapi \
-	libraw.vapi \
+	libraw_r.vapi \
 	gdk-none.vapi
 
 RESOURCE_FILES = \
@@ -271,7 +271,7 @@
 	gexiv2
 
 LIBRAW_PKG = \
-	libraw
+	libraw_r
 
 ifdef LINUX
 EXT_PKGS += \
@@ -391,6 +391,11 @@
 LIBRAW_CONFIG=./libraw-config
 endif
 
+# If libraw is built with OpenMP support, we'll need this.
+ifneq (,$(findstring fopenmp,$(shell ./libraw-config --cflags)))
+	CFLAGS += -fopenmp
+endif
+
 ifdef WINDOWS
 LIBRAW_CONFIG=./libraw-config --windows
 endif