Page MenuHomeFreeBSD
Differential D15565 Diff 44995 mail/thunderbird/files/patch-ijg-libjpeg

Changeset View

Standalone View

View Options

mail/thunderbird/files/patch-ijg-libjpeg

# Partially revert bug 791305 to allow building with system IJG jpeg library # Partially revert bug 791305 to allow building with system IJG jpeg library
diff --git old-configure.in configure.in diff --git old-configure.in configure.in
index f0aeb5d..1c01010 100644 index f0aeb5d..1c01010 100644
--- mozilla/old-configure.in --- old-configure.in
+++ mozilla/old-configure.in +++ old-configure.in
@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then @@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
#include <jpeglib.h> ], #include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG [ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)." #error "Insufficient JPEG library version ($MOZJPEG required)."
- #endif - #endif
- #ifndef JCS_EXTENSIONS - #ifndef JCS_EXTENSIONS
- #error "libjpeg-turbo JCS_EXTENSIONS required" - #error "libjpeg-turbo JCS_EXTENSIONS required"
- #endif - #endif
- ], - ],
+ #endif ], + #endif ],
MOZ_SYSTEM_JPEG=1, MOZ_SYSTEM_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi fi
diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp
index 8fa8200..1d2a259 100644 index 8fa8200..1d2a259 100644
--- mozilla/image/decoders/nsJPEGDecoder.cpp --- image/decoders/nsJPEGDecoder.cpp
+++ mozilla/image/decoders/nsJPEGDecoder.cpp +++ image/decoders/nsJPEGDecoder.cpp
@@ -21,13 +21,28 @@ @@ -21,13 +21,28 @@
extern "C" { extern "C" {
#include "iccjpeg.h" #include "iccjpeg.h"
-} -}
+#ifdef JCS_EXTENSIONS +#ifdef JCS_EXTENSIONS
#if MOZ_BIG_ENDIAN #if MOZ_BIG_ENDIAN
▲ Show 20 Lines • Show All 352 Lines • Show Last 20 Lines