diff options
author | Tristan Heaven <tristan@gentoo.org> | 2008-09-02 00:12:06 +0000 |
---|---|---|
committer | Tristan Heaven <tristan@gentoo.org> | 2008-09-02 00:12:06 +0000 |
commit | 5b76952a17f1f3f2027b776a04b70d639ca9664e (patch) | |
tree | de4d6684f87f7714f9b606c7ea4f18fb6b4fa4f1 /media-libs | |
parent | Fix implicit declarations and linking on amd64, bug #206375 (diff) | |
download | historical-5b76952a17f1f3f2027b776a04b70d639ca9664e.tar.gz historical-5b76952a17f1f3f2027b776a04b70d639ca9664e.tar.bz2 historical-5b76952a17f1f3f2027b776a04b70d639ca9664e.zip |
Version bump, bug #213969
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/freeimage/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/freeimage/Manifest | 20 | ||||
-rw-r--r-- | media-libs/freeimage/files/freeimage-3.9.3-build.patch | 136 | ||||
-rw-r--r-- | media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch | 95 | ||||
-rw-r--r-- | media-libs/freeimage/freeimage-3.11.0.ebuild | 44 | ||||
-rw-r--r-- | media-libs/freeimage/freeimage-3.9.3-r1.ebuild | 50 |
6 files changed, 65 insertions, 289 deletions
diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog index 7043e20c4c95..aa6e9bfed659 100644 --- a/media-libs/freeimage/ChangeLog +++ b/media-libs/freeimage/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freeimage -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.4 2007/05/04 16:41:55 mabi Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.5 2008/09/02 00:12:06 nyhm Exp $ + +*freeimage-3.11.0 (02 Sep 2008) + + 02 Sep 2008; Tristan Heaven <nyhm@gentoo.org> +freeimage-3.11.0.ebuild: + Version bump, bug #213969 04 May 2007; Matti Bickel <mabi@gentoo.org> freeimage-3.9.3-r1.ebuild: keyworded ~ppc (bug #174055) diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest index 86e9a1540222..0bc4daefac51 100644 --- a/media-libs/freeimage/Manifest +++ b/media-libs/freeimage/Manifest @@ -1,7 +1,15 @@ -AUX freeimage-3.9.3-build.patch 4851 RMD160 9aa0f4e1db53f5079bf94088c1f0ffa98f3f221d SHA1 82488ad79d6e61af1aa90f62d3c044ee4ea835bc SHA256 f384c64a1e07ee43e1c830d1eb96f411f9df2ae964c4615d4c50877eac12876a -AUX freeimage-3.9.3-sys-headers.patch 2399 RMD160 3b790286432e8d535c4e0950cc6ca2e31881bf2a SHA1 0b8f9542d88d9c47709b4840249aaf434a166055 SHA256 402349dd49decb1f2e343b3607abd6118066358ada64a33391f3abdc70e888b6 -DIST FreeImage393.pdf 2158061 RMD160 46ed9fd6781560a17220d5f9d5128207c8d7e8d0 SHA1 29981db35b5f62ab94450af5d3093265237bac81 SHA256 a982dc7fe4d0c40e650ca55fa0b010ed13b15c0681e3831ced48f95853952395 -DIST FreeImage393.zip 2507055 RMD160 d7a33a6c9b101d39db16ee18f9177b3f590df6ab SHA1 07696e54ed246d08cf401a9e39e9256b4e73ec9a SHA256 59f6b75d778e40eff7cb4068e556c65230f9fe1af8d17ad74fec48f334a34fc0 -EBUILD freeimage-3.9.3-r1.ebuild 1286 RMD160 0c288365c3606d3511518283b6169735d4b9ac08 SHA1 c47955c49298e60cbf85f3911bc754969abdbd54 SHA256 984a628bdab92c57b21b36da8c7c4f2544e8ee87a3aac639ca0702ee2afe8c13 -MISC ChangeLog 805 RMD160 5a898e3c2375fbf5aa9827dd35d7114104a8566e SHA1 9b61247ed5a26b898b9ba70af81203ff805f4223 SHA256 72a02291e22c958106d9233a8fad349d675bcba520c6e3eb93bdcefb43efb800 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST FreeImage3110.pdf 970333 RMD160 2f5b743f0fda1b80816837281473bff1c4a4d86f SHA1 c9565337be5aaca351b9281cfa07bacbb3a6dcc5 SHA256 c1dca2146d7cc5bb80a3baeae3ad48dcb89071e5581454c016cc105ee2fcab9d +DIST FreeImage3110.zip 4250382 RMD160 3c0ed8f6c6fde9fd7fa84d61aa8efecb1a63727a SHA1 59caec5b6294b4da6b6418787f15b4be9a69a7fc SHA256 84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c +EBUILD freeimage-3.11.0.ebuild 1234 RMD160 874ede7ece16230988601a62acb292a4bf2d79c2 SHA1 cee67b2fd5858c81f5c5fdc2e2898cdfa5a80177 SHA256 6a5c4c673359d9ee542349f4637f11787d2be05d69b26744f4e0f9823e06f9bf +MISC ChangeLog 941 RMD160 3eaa239356367fa5cffdd9745fbdce6b430afeca SHA1 ca6248c01d3bffd3e5cc394488d07eadfd22118b SHA256 466ed25dc618df0fe468c35101583dad775c0fea7e3b0eefe3ee39c1b52f85f4 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAki8hNsACgkQdz7hIScOURHrKwCg6aRaYXl5AmDrDxkDwRSUsSDx +G9AAn0cdbhujcsHEi1erJDsKpwS7+qBo +=nCN4 +-----END PGP SIGNATURE----- diff --git a/media-libs/freeimage/files/freeimage-3.9.3-build.patch b/media-libs/freeimage/files/freeimage-3.9.3-build.patch deleted file mode 100644 index 4dfe8928f28d..000000000000 --- a/media-libs/freeimage/files/freeimage-3.9.3-build.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- 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)
diff --git a/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch b/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch deleted file mode 100644 index 2fcdbb43ade2..000000000000 --- a/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- Source/FreeImage/PluginJPEG.cpp -+++ Source/FreeImage/PluginJPEG.cpp -@@ -35,8 +35,8 @@ - #include <setjmp.h>
-
- #include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
-
- #include "FreeImage.h"
---- Source/FreeImage/PluginMNG.cpp -+++ Source/FreeImage/PluginMNG.cpp -@@ -22,7 +22,7 @@ - #include "FreeImage.h"
- #include "Utilities.h"
-
--#include "../LibMNG/libmng.h"
-+#include <libmng.h>
-
- // ----------------------------------------------------------
- // Constants + headers
---- Source/FreeImage/PluginPNG.cpp -+++ Source/FreeImage/PluginPNG.cpp -@@ -37,7 +37,10 @@ -
- // ----------------------------------------------------------
-
--#include "../LibPNG/png.h"
-+#define PNG_iTXt_SUPPORTED
-+#define PNG_READ_iTXt_SUPPORTED
-+#define PNG_WRITE_iTXt_SUPPORTED
-+#include <png.h>
-
- // ----------------------------------------------------------
-
---- Source/FreeImage/ZLibInterface.cpp -+++ Source/FreeImage/ZLibInterface.cpp -@@ -19,7 +19,7 @@ - // Use at your own risk!
- // ==========================================================
-
--#include "../ZLib/zlib.h"
-+#include <zlib.h>
- #include "../ZLib/zutil.h"
- #include "FreeImage.h"
- #include "Utilities.h"
---- Source/FreeImageToolkit/JPEGTransform.cpp -+++ Source/FreeImageToolkit/JPEGTransform.cpp -@@ -26,8 +26,8 @@ - #include <setjmp.h>
-
- #include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <jpeglib.h>
-+#include <jerror.h>
- #include "../LibJPEG/transupp.h"
- }
-
---- Source/LibJPEG/jinclude.h -+++ Source/LibJPEG/jinclude.h -@@ -17,7 +17,7 @@ -
- /* Include auto-config file to find out which system include files we need. */
-
--#include "jconfig.h" /* auto configuration options */
-+#include <jconfig.h>
- #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */
-
- /*
---- Source/LibJPEG/transupp.c -+++ Source/LibJPEG/transupp.c -@@ -18,7 +18,7 @@ - #define JPEG_INTERNALS
-
- #include "jinclude.h"
--#include "jpeglib.h"
-+#include <jpeglib.h>
- #include "transupp.h" /* My own external interface */
- #include <ctype.h> /* to declare isdigit() */
-
---- Source/ZLib/zutil.h -+++ Source/ZLib/zutil.h -@@ -14,7 +14,7 @@ - #define ZUTIL_H
-
- #define ZLIB_INTERNAL
--#include "zlib.h"
-+#include <zlib.h>
-
- #ifdef STDC
- # ifndef _WIN32_WCE
diff --git a/media-libs/freeimage/freeimage-3.11.0.ebuild b/media-libs/freeimage/freeimage-3.11.0.ebuild new file mode 100644 index 000000000000..27e85875f19b --- /dev/null +++ b/media-libs/freeimage/freeimage-3.11.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild,v 1.1 2008/09/02 00:12:06 nyhm Exp $ + +inherit toolchain-funcs multilib + +MY_PN=FreeImage +MY_P=${MY_PN}${PV//.} +DESCRIPTION="Image library supporting many formats" +HOMEPAGE="http://freeimage.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip + doc? ( mirror://sourceforge/${PN}/${MY_P}.pdf )" + +LICENSE="|| ( GPL-2 FIPL-1.0 )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc" + +DEPEND="app-arch/unzip" +RDEPEND="" + +S=${WORKDIR}/${MY_PN} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e "/^CC =/s:gcc:$(tc-getCC) ${CFLAGS} -Wall:" \ + -e "/^CXX =/s:g++:$(tc-getCXX) ${CXXFLAGS} -Wall:" \ + -e "/^AR = /s:ar:$(tc-getAR):" \ + -e "/^INCDIR = /s:/usr/include:${D}/usr/include:" \ + -e "/^INSTALLDIR = /s:/usr/lib:${D}/usr/$(get_libdir):" \ + -e '/^COMPILERFLAGS =/s:-O3::' \ + -e "/\$(CC) -s /s: -s : ${LDFLAGS} :" \ + Makefile.gnu \ + || die "sed failed" +} + +src_install() { + dodir /usr/include /usr/$(get_libdir) + emake install || die "emake install failed" + dodoc README.linux Whatsnew.txt + use doc && dodoc "${DISTDIR}"/${MY_P}.pdf +} diff --git a/media-libs/freeimage/freeimage-3.9.3-r1.ebuild b/media-libs/freeimage/freeimage-3.9.3-r1.ebuild deleted file mode 100644 index 936a61ab59e8..000000000000 --- a/media-libs/freeimage/freeimage-3.9.3-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.9.3-r1.ebuild,v 1.2 2007/05/04 16:41:55 mabi Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -MY_PN=FreeImage -MY_P=${MY_PN}${PV//.} -DESCRIPTION="Image library supporting many formats" -HOMEPAGE="http://freeimage.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip - doc? ( mirror://sourceforge/${PN}/${MY_P}.pdf )" - -LICENSE="GPL-2 FIPL-1.0" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" - -RDEPEND="media-libs/jpeg - media-libs/tiff - media-libs/libpng - media-libs/libmng" -DEPEND="${RDEPEND} - app-arch/unzip" - -S=${WORKDIR}/${MY_PN} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-sys-headers.patch - edos2unix gensrclist.sh genfipsrclist.sh - sh ./gensrclist.sh || die "gensrclist failed" - sh ./genfipsrclist.sh || die "genfipsrclist failed" -} - -src_compile() { - tc-export CC CXX AR - append-flags -fno-strict-aliasing - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install \ - || die "emake install failed" - dodoc README.linux Whatsnew.txt - use doc && dodoc "${DISTDIR}"/${MY_P}.pdf -} |