wok rev 6838

merge
author Rohit Joshi <jozee@slitaz.org>
date Tue Oct 19 21:33:59 2010 -0400 (2010-10-19)
parents f25424541723 a83d1412687d
children 258a3e38cf19
files
line diff
     1.1 --- a/freeimage-dev/receipt	Tue Oct 19 21:30:50 2010 -0400
     1.2 +++ b/freeimage-dev/receipt	Tue Oct 19 21:33:59 2010 -0400
     1.3 @@ -1,10 +1,11 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="freeimage-dev"
     1.7 -VERSION="3110"
     1.8 +VERSION="3141"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="freeimage devel files"
    1.11  MAINTAINER="jozee@slitaz.org"
    1.12 +DEPENDS="freeimage"
    1.13  WANTED="freeimage"
    1.14  SOURCE="FreeImage"
    1.15  WEB_SITE="http://freeimage.sourceforge.net/"
     2.1 --- a/freeimage/receipt	Tue Oct 19 21:30:50 2010 -0400
     2.2 +++ b/freeimage/receipt	Tue Oct 19 21:33:59 2010 -0400
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="freeimage"
     2.7 -VERSION="3110"
     2.8 +VERSION="3141"
     2.9  CATEGORY="graphics"
    2.10  SHORT_DESC="library to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others"
    2.11  MAINTAINER="jozee@slitaz.org"
    2.12 @@ -16,6 +16,7 @@
    2.13  compile_rules()
    2.14  {
    2.15  	cd $SOURCE
    2.16 +	patch -Np1 -i ../stuff/gcc4.5_ln.patch
    2.17  	pkgdir=$PWD/_pkg
    2.18  	incl=$pkgdir/usr/include
    2.19      dest=$pkgdir/usr/lib
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/freeimage/stuff/gcc4.5_ln.patch	Tue Oct 19 21:33:59 2010 -0400
     3.3 @@ -0,0 +1,62 @@
     3.4 +diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
     3.5 +--- FreeImage.orig//Makefile.fip	2010-08-10 19:15:20.000000000 +0200
     3.6 ++++ FreeImage.new//Makefile.fip	2010-09-12 23:29:36.000000000 +0200
     3.7 +@@ -15,9 +15,9 @@
     3.8 + 
     3.9 + MODULES = $(SRCS:.c=.o)
    3.10 + MODULES := $(MODULES:.cpp=.o)
    3.11 +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    3.12 ++CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    3.13 + CFLAGS += $(INCLUDE)
    3.14 +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    3.15 ++CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    3.16 + CXXFLAGS += $(INCLUDE)
    3.17 + 
    3.18 + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
    3.19 +diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
    3.20 +--- FreeImage.orig//Makefile.gnu	2010-08-10 19:15:20.000000000 +0200
    3.21 ++++ FreeImage.new//Makefile.gnu	2010-09-12 23:01:57.000000000 +0200
    3.22 +@@ -15,9 +15,9 @@
    3.23 + 
    3.24 + MODULES = $(SRCS:.c=.o)
    3.25 + MODULES := $(MODULES:.cpp=.o)
    3.26 +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    3.27 ++CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    3.28 + CFLAGS += $(INCLUDE)
    3.29 +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    3.30 ++CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    3.31 + CXXFLAGS += $(INCLUDE)
    3.32 + 
    3.33 + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
    3.34 +@@ -65,9 +65,6 @@
    3.35 + 	install -m 644 -o root -g root $(HEADER) $(INCDIR)
    3.36 + 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
    3.37 + 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
    3.38 +-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
    3.39 +-	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
    3.40 +-	ldconfig
    3.41 + 
    3.42 + clean:
    3.43 + 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
    3.44 +diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
    3.45 +--- FreeImage.orig//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:15:20.000000000 +0200
    3.46 ++++ FreeImage.new//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:16:12.000000000 +0200
    3.47 +@@ -21,6 +21,7 @@
    3.48 + 
    3.49 + #include "FreeImage.h"
    3.50 + #include "Utilities.h"
    3.51 ++#include <limits.h>
    3.52 + 
    3.53 + /** @brief Determines, whether a palletized image is visually greyscale or not.
    3.54 +  
    3.55 +diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
    3.56 +--- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 19:15:20.000000000 +0200
    3.57 ++++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 21:43:26.000000000 +0200
    3.58 +@@ -51,6 +51,7 @@
    3.59 + 
    3.60 + #include <iostream>
    3.61 + #include <iomanip>
    3.62 ++#include <cstring>
    3.63 + 
    3.64 + #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
    3.65 + // suppress exception specification warnings