mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 10:32:13 +08:00
63 lines
2.7 KiB
Diff
63 lines
2.7 KiB
Diff
diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
|
|
--- FreeImage.orig//Makefile.fip 2010-08-10 19:15:20.000000000 +0200
|
|
+++ FreeImage.new//Makefile.fip 2010-09-12 23:29:36.000000000 +0200
|
|
@@ -15,9 +15,9 @@
|
|
|
|
MODULES = $(SRCS:.c=.o)
|
|
MODULES := $(MODULES:.cpp=.o)
|
|
-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
|
+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
|
CFLAGS += $(INCLUDE)
|
|
-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
|
+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
|
CXXFLAGS += $(INCLUDE)
|
|
|
|
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
|
diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
|
|
--- FreeImage.orig//Makefile.gnu 2010-08-10 19:15:20.000000000 +0200
|
|
+++ FreeImage.new//Makefile.gnu 2010-09-12 23:01:57.000000000 +0200
|
|
@@ -15,9 +15,9 @@
|
|
|
|
MODULES = $(SRCS:.c=.o)
|
|
MODULES := $(MODULES:.cpp=.o)
|
|
-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
|
+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
|
CFLAGS += $(INCLUDE)
|
|
-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
|
+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
|
CXXFLAGS += $(INCLUDE)
|
|
|
|
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
|
@@ -65,9 +65,6 @@
|
|
install -m 644 -o root -g root $(HEADER) $(INCDIR)
|
|
install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
|
|
install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
|
|
- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
|
|
- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
|
|
- ldconfig
|
|
|
|
clean:
|
|
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
|
|
diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
|
|
--- FreeImage.orig//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:15:20.000000000 +0200
|
|
+++ FreeImage.new//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:16:12.000000000 +0200
|
|
@@ -21,6 +21,7 @@
|
|
|
|
#include "FreeImage.h"
|
|
#include "Utilities.h"
|
|
+#include <limits.h>
|
|
|
|
/** @brief Determines, whether a palletized image is visually greyscale or not.
|
|
|
|
diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
|
|
--- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 19:15:20.000000000 +0200
|
|
+++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 21:43:26.000000000 +0200
|
|
@@ -51,6 +51,7 @@
|
|
|
|
#include <iostream>
|
|
#include <iomanip>
|
|
+#include <cstring>
|
|
|
|
#if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
|
|
// suppress exception specification warnings
|