[patch] digikam-0.9.0-external-dcraw.patch

digikam-0.9.0-external-dcraw.patch (text/plain), 1.83 KB, created by Guillaume Castagnino on 2007-02-04 12:37:08 UTC

diff -r -U3 digikam-0.9.0/digikam/libs/dcraw/dcrawbinary.cpp digikam-0.9.0.new/digikam/libs/dcraw/dcrawbinary.cpp
--- digikam-0.9.0/digikam/libs/dcraw/dcrawbinary.cpp	2006-12-17 11:13:08.000000000 +0100
+++ digikam-0.9.0.new/digikam/libs/dcraw/dcrawbinary.cpp	2007-02-04 13:11:00.000000000 +0100
@@ -107,7 +107,7 @@
 
 const char *DcrawBinary::path()
 {
-    return "digikamdcraw";
+    return "dcraw";
 }
 
 bool DcrawBinary::isAvailable() const
diff -r -U3 digikam-0.9.0/digikam/libs/dcraw/Makefile.am digikam-0.9.0.new/digikam/libs/dcraw/Makefile.am
--- digikam-0.9.0/digikam/libs/dcraw/Makefile.am	2006-12-17 11:13:08.000000000 +0100
+++ digikam-0.9.0.new/digikam/libs/dcraw/Makefile.am	2007-02-04 13:11:31.000000000 +0100
@@ -13,26 +13,3 @@
 
 libdcraw_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
-#-- dcraw binary -------------------------------------------------
-
-# digiKam use a dedicaced dcraw binary program to run. This is mandatory 
-# since dcraw author have broken the command line options 
-# compatibility with the 8.x serie.
-# Also, dcraw is not available like a library.
-# The dcraw.c source code is just a copy of official implementation, but 
-# this one have been completly tested with digiKam core. 
-# Note: dcraw project page is http://cybercom.net/~dcoffin
-
-bin_PROGRAMS = digikamdcraw
-
-# This line is require to prevent broken compilation with -std=iso9899:1990 gcc option.
-# In fact, dcraw.c use lcms.h witch use the "inline" keyword witch do not exist in pure C 
-# implementation. The -Dinline option please compiler to see inline with this option.
-# Note : using -std-c99 instead -std=iso9899:1990 is not possible because some compiler 
-# do not support it.
-# Thanks to Andras Mantia for this tip.
-digikamdcraw_CFLAGS = -Dinline= -w
-
-digikamdcraw_SOURCES = dcraw.c
-
-digikamdcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) $(LCMS_LIBS)