Initial commit, bug #165938

(Portage version: 2.1.2.3)

2 files changed, 142 insertions, 0 deletions

diff --git a/media-libs/freeimage/files/digest-freeimage-3.9.3 b/media-libs/freeimage/files/digest-freeimage-3.9.3
new file mode 100644
index 000000000000..ae5ef1a19f53
--- /dev/null
+++ b/media-libs/freeimage/files/digest-freeimage-3.9.3
@@ -0,0 +1,6 @@
+MD5 5a59f1d2c380da666f1cd42e082e8041 FreeImage393.pdf 2158061
+RMD160 46ed9fd6781560a17220d5f9d5128207c8d7e8d0 FreeImage393.pdf 2158061
+SHA256 a982dc7fe4d0c40e650ca55fa0b010ed13b15c0681e3831ced48f95853952395 FreeImage393.pdf 2158061
+MD5 bf3574fa4e6135cf511d5ff4bc871ec3 FreeImage393.zip 2507055
+RMD160 d7a33a6c9b101d39db16ee18f9177b3f590df6ab FreeImage393.zip 2507055
+SHA256 59f6b75d778e40eff7cb4068e556c65230f9fe1af8d17ad74fec48f334a34fc0 FreeImage393.zip 2507055
diff --git a/media-libs/freeimage/files/freeimage-3.9.3-build.patch b/media-libs/freeimage/files/freeimage-3.9.3-build.patch
new file mode 100644
index 000000000000..4dfe8928f28d
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.9.3-build.patch
@@ -0,0 +1,136 @@
+--- genfipsrclist.sh
++++ genfipsrclist.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh

+ 

+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibMNG Source/LibPNG Source/LibTIFF Source/ZLib Wrapper/FreeImagePlus"

++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Wrapper/FreeImagePlus"

+ 

+ echo "VER_MAJOR = 3" > fipMakefile.srcs

+ echo "VER_MINOR = 9.3" >> fipMakefile.srcs

+@@ -12,7 +12,7 @@
+ 		egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' '  ' | tr -s ' ' >> fipMakefile.srcs

+ 	fi

+ done

+-echo >> fipMakefile.srcs

++echo Source/LibJPEG/transupp.c >> fipMakefile.srcs

+ 

+ echo -n "INCLUDE =" >> fipMakefile.srcs

+ for DIR in $DIRLIST; do

+--- gensrclist.sh
++++ gensrclist.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh

+ 

+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibMNG Source/LibPNG Source/LibTIFF Source/ZLib"

++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"

+ 

+ echo "VER_MAJOR = 3" > Makefile.srcs

+ echo "VER_MINOR = 9.3" >> Makefile.srcs

+@@ -12,7 +12,7 @@
+ 		egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' '  ' | tr -s ' ' >> Makefile.srcs

+ 	fi

+ done

+-echo >> Makefile.srcs

++echo Source/LibJPEG/transupp.c >> Makefile.srcs

+ 

+ echo -n "INCLS = " >> Makefile.srcs

+ find . -name "*.h" -print | xargs echo >> Makefile.srcs

+--- Makefile
++++ Makefile
+@@ -14,8 +14,11 @@
+     MAKEFILE = solaris

+ endif

+ 

++FLAGS = -Wall -fPIC

++LIBS = -lstdc++ -lpng -lmng -ltiff -ljpeg

+ default:

+-	$(MAKE) -f Makefile.$(MAKEFILE) 

++	$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" LIBRARIES="$(LIBS)" -f Makefile.gnu

++	$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" LIBRARIES="$(LIBS)" -f Makefile.fip

+ 

+ all:

+ 	$(MAKE) -f Makefile.$(MAKEFILE) all 

+@@ -24,7 +27,8 @@
+ 	$(MAKE) -f Makefile.$(MAKEFILE) dist 

+ 

+ install:

+-	$(MAKE) -f Makefile.$(MAKEFILE) install 

++	$(MAKE) -f Makefile.gnu install

++	$(MAKE) -f Makefile.fip install

+ 

+ clean:

+ 	$(MAKE) -f Makefile.$(MAKEFILE) clean 

+--- Makefile.fip
++++ Makefile.fip
+@@ -19,8 +19,8 @@
+ 

+ MODULES = $(SRCS:.c=.o)

+ MODULES := $(MODULES:.cpp=.o)

+-CFLAGS = $(COMPILERFLAGS) $(INCLUDE)

+-CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)

++CFLAGS += $(COMPILERFLAGS) $(INCLUDE)

++CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)

+ 

+ TARGET  = freeimageplus

+ STATICLIB = lib$(TARGET).a

+@@ -56,16 +56,15 @@
+ 	$(AR) r $@ $(MODULES)

+ 

+ $(SHAREDLIB): $(MODULES)

+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

+ 

+ install:

+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)

+-	install -m 644 -o root -g root $(HEADERFIP) $(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

++	install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)

++	install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR)

++	install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR)

++	install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)

++	ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME)

++	ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME)

+ 

+ clean:

+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

+--- Makefile.gnu
++++ Makefile.gnu
+@@ -19,8 +19,8 @@
+ 

+ MODULES = $(SRCS:.c=.o)

+ MODULES := $(MODULES:.cpp=.o)

+-CFLAGS = $(COMPILERFLAGS) $(INCLUDE)

+-CXXFLAGS = $(COMPILERFLAGS)  -Wno-ctor-dtor-privacy $(INCLUDE)

++CFLAGS += $(COMPILERFLAGS) $(INCLUDE)

++CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)

+ 

+ TARGET  = freeimage

+ STATICLIB = lib$(TARGET).a

+@@ -55,15 +55,15 @@
+ 	$(AR) r $@ $(MODULES)

+ 

+ $(SHAREDLIB): $(MODULES)

+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

+ 

+ install:

+-	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

++	install -d $(DESTDIR)/$(INCDIR) $(DESTDIR)/$(LIBDIR)

++	install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)

++	install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR)

++	install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)

++	ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME)

++	ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME)

+ 

+ clean:

+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)