Fix CVS now, worry about bundled libraries later.
This commit is contained in:
parent
aede9b90d9
commit
502dec11d1
@ -88,8 +88,8 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
|
|||||||
-# LibJXR
|
-# LibJXR
|
||||||
-CXXFLAGS += -D__ANSI__
|
-CXXFLAGS += -D__ANSI__
|
||||||
-CXXFLAGS += $(INCLUDE)
|
-CXXFLAGS += $(INCLUDE)
|
||||||
+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
|
+override CFLAGS += $(INCLUDE) -D__ANSI__ $(shell pkg-config --cflags OpenEXR libpng libtiff-4 libwebp libwebpmux zlib)
|
||||||
+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
|
+override LDFLAGS += -ljpeg $(shell pkg-config --libs OpenEXR libpng libtiff-4 libwebp libwebpmux zlib)
|
||||||
|
|
||||||
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
||||||
- CFLAGS += -fPIC
|
- CFLAGS += -fPIC
|
||||||
@ -114,18 +114,6 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
install -d $(INCDIR) $(INSTALLDIR)
|
install -d $(INCDIR) $(INSTALLDIR)
|
||||||
diff -rupN FreeImage/Source/FreeImage/J2KHelper.cpp FreeImage-new/Source/FreeImage/J2KHelper.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/J2KHelper.cpp 2015-03-02 02:07:08.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/J2KHelper.cpp 2015-09-05 02:13:52.042353324 +0200
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
|
||||||
+#include <openjpeg.h>
|
|
||||||
#include "J2KHelper.h"
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/Plugin.cpp FreeImage-new/Source/FreeImage/Plugin.cpp
|
diff -rupN FreeImage/Source/FreeImage/Plugin.cpp FreeImage-new/Source/FreeImage/Plugin.cpp
|
||||||
--- FreeImage/Source/FreeImage/Plugin.cpp 2015-03-02 02:07:08.000000000 +0100
|
--- FreeImage/Source/FreeImage/Plugin.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
+++ FreeImage-new/Source/FreeImage/Plugin.cpp 2015-09-05 02:13:52.042353324 +0200
|
+++ FreeImage-new/Source/FreeImage/Plugin.cpp 2015-09-05 02:13:52.042353324 +0200
|
||||||
@ -173,58 +161,6 @@ diff -rupN FreeImage/Source/FreeImage/PluginEXR.cpp FreeImage-new/Source/FreeIma
|
|||||||
|
|
||||||
|
|
||||||
// ==========================================================
|
// ==========================================================
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginJ2K.cpp FreeImage-new/Source/FreeImage/PluginJ2K.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJ2K.cpp 2015-03-02 02:07:08.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginJ2K.cpp 2015-09-05 02:13:52.043353343 +0200
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
|
||||||
+#include <openjpeg.h>
|
|
||||||
#include "J2KHelper.h"
|
|
||||||
|
|
||||||
// ==========================================================
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginJP2.cpp FreeImage-new/Source/FreeImage/PluginJP2.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJP2.cpp 2015-03-02 02:07:08.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginJP2.cpp 2015-09-05 02:13:52.043353343 +0200
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
|
||||||
+#include <openjpeg.h>
|
|
||||||
#include "J2KHelper.h"
|
|
||||||
|
|
||||||
// ==========================================================
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeImage/PluginJPEG.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJPEG.cpp 2015-03-02 02:07:08.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginJPEG.cpp 2015-09-05 02:13:52.043353343 +0200
|
|
||||||
@@ -35,9 +35,9 @@ extern "C" {
|
|
||||||
#undef FAR
|
|
||||||
#include <setjmp.h>
|
|
||||||
|
|
||||||
-#include "../LibJPEG/jinclude.h"
|
|
||||||
-#include "../LibJPEG/jpeglib.h"
|
|
||||||
-#include "../LibJPEG/jerror.h"
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <jpeglib.h>
|
|
||||||
+#include <jerror.h>
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJXR.cpp 2015-03-02 02:07:08.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginJXR.cpp 2015-09-05 02:13:52.043353343 +0200
|
|
||||||
@@ -23,7 +23,7 @@
|
|
||||||
#include "Utilities.h"
|
|
||||||
#include "../Metadata/FreeImageTag.h"
|
|
||||||
|
|
||||||
-#include "../LibJXR/jxrgluelib/JXRGlue.h"
|
|
||||||
+#include <JXRGlue.h>
|
|
||||||
|
|
||||||
// ==========================================================
|
|
||||||
// Plugin Interface
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp
|
diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp
|
||||||
--- FreeImage/Source/FreeImage/PluginPNG.cpp 2015-03-10 20:16:12.000000000 +0100
|
--- FreeImage/Source/FreeImage/PluginPNG.cpp 2015-03-10 20:16:12.000000000 +0100
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginPNG.cpp 2015-09-05 02:13:52.044353363 +0200
|
+++ FreeImage-new/Source/FreeImage/PluginPNG.cpp 2015-09-05 02:13:52.044353363 +0200
|
||||||
@ -239,33 +175,6 @@ diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeIma
|
|||||||
|
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginRAW.cpp FreeImage-new/Source/FreeImage/PluginRAW.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/PluginRAW.cpp 2015-03-08 20:12:04.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginRAW.cpp 2015-09-05 02:13:52.044353363 +0200
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
// Use at your own risk!
|
|
||||||
// ==========================================================
|
|
||||||
|
|
||||||
-#include "../LibRawLite/libraw/libraw.h"
|
|
||||||
+#include <libraw/libraw.h>
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
diff -rupN FreeImage/Source/FreeImage/PluginTIFF.cpp FreeImage-new/Source/FreeImage/PluginTIFF.cpp
|
|
||||||
--- FreeImage/Source/FreeImage/PluginTIFF.cpp 2015-03-02 02:07:08.000000000 +0100
|
|
||||||
+++ FreeImage-new/Source/FreeImage/PluginTIFF.cpp 2015-09-05 02:13:52.044353363 +0200
|
|
||||||
@@ -37,9 +37,9 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibTIFF4/tiffiop.h"
|
|
||||||
+#include <tiffio.h>
|
|
||||||
#include "../Metadata/FreeImageTag.h"
|
|
||||||
-#include "../OpenEXR/Half/half.h"
|
|
||||||
+#include <OpenEXR/half.h>
|
|
||||||
|
|
||||||
#include "FreeImageIO.h"
|
|
||||||
#include "PSDParser.h"
|
|
||||||
@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char
|
@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char
|
||||||
return tif;
|
return tif;
|
||||||
}
|
}
|
||||||
|
@ -20,15 +20,17 @@ Patch1: FreeImage-3.17.0_doxygen.patch
|
|||||||
Patch2: FreeImage-3.17.0_CVE-2015-0852.patch
|
Patch2: FreeImage-3.17.0_CVE-2015-0852.patch
|
||||||
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: jxrlib-devel
|
#BuildRequires: jxrlib-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libmng-devel
|
BuildRequires: libmng-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
BuildRequires: libwebp-devel
|
BuildRequires: libwebp-devel
|
||||||
BuildRequires: LibRaw-devel
|
#BuildRequires: LibRaw-devel
|
||||||
BuildRequires: OpenEXR-devel
|
#BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: openjpeg2-devel
|
#BuildRequires: openjpeg2-devel
|
||||||
|
|
||||||
|
Provides: bundled(jxrlib) bundled(LibRaw) bundled(OpenEXR) bundled(openjpeg2)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
FreeImage is a library for developers who would like to support popular
|
FreeImage is a library for developers who would like to support popular
|
||||||
|
Loading…
Reference in New Issue
Block a user