diff options
| -rw-r--r-- | media-gfx/xv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/xv/Manifest | 45 | ||||
| -rw-r--r-- | media-gfx/xv/files/xv-3.10a-r12-xv-osx.patch | 51 | ||||
| -rw-r--r-- | media-gfx/xv/xv-3.10a-r12.ebuild | 9 |
4 files changed, 80 insertions, 31 deletions
diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog index 2260002c5029..502a56f964a3 100644 --- a/media-gfx/xv/ChangeLog +++ b/media-gfx/xv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/xv # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.71 2005/10/18 01:22:50 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.72 2005/11/01 09:24:02 grobian Exp $ + + 01 Nov 2005; Fabian Groffen <grobian@gentoo.org> + +files/xv-3.10a-r12-xv-osx.patch, xv-3.10a-r12.ebuild: + Fixed compilation issues and marked ~ppc-macos (bug #110942) 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r12.ebuild: Mark 3.10a-r12 stable on alpha diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest index adc6dda1cac8..33cbfb2ef8a2 100644 --- a/media-gfx/xv/Manifest +++ b/media-gfx/xv/Manifest @@ -1,36 +1,27 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222 -MD5 4ed531f3e16bf8617452d88f6d9d9ae8 ChangeLog 10670 +MD5 e85f1a876b925f9a8b4a29eabc3e3788 xv-3.10a-r11.ebuild 2321 MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529 MD5 2954b497004732142fd6d69104cf2499 xv-3.10a-r10.ebuild 2689 -MD5 e85f1a876b925f9a8b4a29eabc3e3788 xv-3.10a-r11.ebuild 2321 -MD5 540a3d73279e42d75850dc0e3ec8abcb xv-3.10a-r12.ebuild 2199 MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347 +MD5 3e3cbbe0d8602822f71130f7ac0d3df6 xv-3.10a-r12.ebuild 2345 +MD5 4ed531f3e16bf8617452d88f6d9d9ae8 ChangeLog 10670 +MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222 +MD5 d5c3a8ae96703604cb323e57a7e8e554 files/jumbo-patch-nojpeg.diff 469 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127 -MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418 +MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127 +MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359 -MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864 -MD5 63deb1e35f05b4f406f141d1e48ff17b files/xv-filename-format-string.diff 319 +MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249 MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079 -MD5 5abcdae2ed559d5909856a83ab102180 files/xv-3.10a-r11-xv-osx.patch 1088 +MD5 6bf2b7ee3f291595d8ee51f8d6bc59e6 files/xv-3.10a-r12-xv-osx.patch 1686 +MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127 +MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145 +MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145 +MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222 +MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341 MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615 -MD5 d5c3a8ae96703604cb323e57a7e8e554 files/jumbo-patch-nojpeg.diff 469 MD5 4e152e258221470988e2fc31bd8e03d5 files/xv-3.10a-yaos.dif.bz2 4212 -MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145 -MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538 +MD5 5abcdae2ed559d5909856a83ab102180 files/xv-3.10a-r11-xv-osx.patch 1088 +MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418 +MD5 63deb1e35f05b4f406f141d1e48ff17b files/xv-filename-format-string.diff 319 MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553 -MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341 -MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249 -MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222 -MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145 -MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127 -MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDVE53JrHF4yAQTrARAmvlAKDH8LIPWtuJGxQ6SmLKUMVPJOKE4QCgvazd -3WdheixTJ8DX3tZqMAEFfp0= -=oI4Z ------END PGP SIGNATURE----- +MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864 diff --git a/media-gfx/xv/files/xv-3.10a-r12-xv-osx.patch b/media-gfx/xv/files/xv-3.10a-r12-xv-osx.patch new file mode 100644 index 000000000000..91ae305d3f9a --- /dev/null +++ b/media-gfx/xv/files/xv-3.10a-r12-xv-osx.patch @@ -0,0 +1,51 @@ +--- xv.h.orig 2005-10-31 20:49:18.000000000 +0100 ++++ xv.h 2005-10-31 22:10:17.000000000 +0100 +@@ -157,7 +157,7 @@ + + #ifndef VMS + # include <errno.h> +-# ifndef __NetBSD__ ++# if !defined(__NetBSD__) && !defined(__APPLE__) + # if !(defined __GLIBC__ && __GLIBC__ >= 2) + extern int errno; /* SHOULD be in errno.h, but often isn't */ + extern char *sys_errlist[]; /* this too... */ +@@ -170,7 +170,7 @@ + #ifdef VMS + # define ERRSTR(x) strerror(x, vaxc$errno) + #else +-# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */ ++# if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */ + # define ERRSTR(x) strerror(x) + # else + # define ERRSTR(x) sys_errlist[x] +@@ -214,6 +214,8 @@ + + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include <sys/malloc.h> /* it's in 'sys' on HPs and NeXT */ ++# elif defined(__APPLE__) ++# include <malloc/malloc.h> + # else + # include <malloc.h> + # endif +@@ -347,7 +347,11 @@ + #endif + + #ifndef S_IRWUSR +-# define S_IRWUSR (S_IRUSR|__S_IWRITE) ++# ifdef __APPLE__ ++# define S_IRWUSR (S_IRUSR|S_IWUSR) ++# else ++# define S_IRWUSR (S_IRUSR|__S_IWRITE) ++# endif + #endif + + #ifndef MAXPATHLEN +@@ -380,7 +380,7 @@ + * them later. */ + #ifndef VMS /* VMS hates multi-line definitions */ + # if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ +- defined(__bsdi__) ++ defined(__bsdi__) || defined(__APPLE__) + # ifndef USE_MKSTEMP + # define USE_MKSTEMP /* use 'mkstemp()' instead of 'mktemp()' */ + # endif /* >> SECURITY ISSUE << */ diff --git a/media-gfx/xv/xv-3.10a-r12.ebuild b/media-gfx/xv/xv-3.10a-r12.ebuild index dca00453aea6..7ab60a4a7cc3 100644 --- a/media-gfx/xv/xv-3.10a-r12.ebuild +++ b/media-gfx/xv/xv-3.10a-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.10 2005/10/18 01:22:51 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.11 2005/11/01 09:24:02 grobian Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.bz2 ftp:/ LICENSE="xv" SLOT="0" -KEYWORDS="alpha amd64 ~hppa ia64 mips ~ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 ~hppa ia64 mips ~ppc ~ppc-macos ~ppc64 sparc x86" IUSE="jpeg tiff png" DEPEND="virtual/x11 @@ -31,6 +31,10 @@ src_unpack() { epatch ${WORKDIR}/${P}-jumbo-fix-patch-20050410.txt || die epatch ${WORKDIR}/${P}-jumbo-enh-patch-${JUMBOV}.txt || die + # OSX malloc and define patches + epatch "${FILESDIR}/${P}"-r12-xv-osx.patch || die + epatch "${FILESDIR}/${P}"-vdcomp-osx.patch || die + sed -i -e 's/\(^JPEG.*\)/#\1/g' \ -e 's/\(^PNG.*\)/#\1/g' \ -e 's/\(^TIFF.*\)/#\1/g' \ @@ -41,7 +45,6 @@ src_unpack() { # fix installation of ps docs. sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile - } src_compile() { |