From 8226807151ac94d5acbb92b2f0577e1301e27cec Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 14 Mar 2007 23:42:28 +0000 Subject: [PATCH] Pushed 2.0.2-r1 into ~arch after testing. Added -j1 and shader.patch to help compilation on some systems for 1.7.6. Package-Manager: portage-2.1.2.2 --- media-gfx/pixie/ChangeLog | 8 ++-- media-gfx/pixie/Manifest | 38 ++++++++----------- .../pixie/files/pixie-1.7.6-shader.patch | 12 ++++++ media-gfx/pixie/pixie-1.7.6.ebuild | 10 ++++- media-gfx/pixie/pixie-2.0.2-r1.ebuild | 4 +- 5 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 media-gfx/pixie/files/pixie-1.7.6-shader.patch diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog index e774c130b915..341841bc614a 100644 --- a/media-gfx/pixie/ChangeLog +++ b/media-gfx/pixie/ChangeLog @@ -1,10 +1,12 @@ # ChangeLog for media-gfx/pixie # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.31 2007/03/14 17:52:16 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.32 2007/03/14 23:42:28 eradicator Exp $ - 14 Mar 2007; Christian Faulhammer + 14 Mar 2007; Jeremy Huddleston + +files/pixie-1.7.6-shader.patch, pixie-1.7.6.ebuild, pixie-2.0.2-r1.ebuild: - stable x86, bug 160020 + Pushed 2.0.2-r1 into ~arch after testing. Added -j1 and shader.patch to help + compilation on some systems for 1.7.6. *pixie-2.0.2-r1 (14 Mar 2007) diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest index 3a16b94ed2fb..64f089a5f76a 100644 --- a/media-gfx/pixie/Manifest +++ b/media-gfx/pixie/Manifest @@ -1,24 +1,25 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX pixie-1.7.6-libcommon.patch 7130 RMD160 2cca6cb1b8442420d356a20bb15821f55be6f32d SHA1 41af25e4709aa17ba8a3ad2aecb2bdb542ee08e9 SHA256 e42c6e8aa18e847908eff8e808a1536e4be8eb006e52b791cb890498fa962165 MD5 b32927aeb814fb83fca4ad56fbf4e172 files/pixie-1.7.6-libcommon.patch 7130 RMD160 2cca6cb1b8442420d356a20bb15821f55be6f32d files/pixie-1.7.6-libcommon.patch 7130 SHA256 e42c6e8aa18e847908eff8e808a1536e4be8eb006e52b791cb890498fa962165 files/pixie-1.7.6-libcommon.patch 7130 +AUX pixie-1.7.6-shader.patch 413 RMD160 75c86202d89dc60da68d77806578f88f0a922cca SHA1 b71e7a9070ba6ce15e5d2f4cf8ad64f8f0b0dacc SHA256 2499340155ac22838adc8a0e707b71817e6797bb2f8cef712fc7090d2960ba77 +MD5 016c141cb1e503153b683da02fb8b58e files/pixie-1.7.6-shader.patch 413 +RMD160 75c86202d89dc60da68d77806578f88f0a922cca files/pixie-1.7.6-shader.patch 413 +SHA256 2499340155ac22838adc8a0e707b71817e6797bb2f8cef712fc7090d2960ba77 files/pixie-1.7.6-shader.patch 413 DIST Pixie-src-1.7.6.tgz 5258068 RMD160 5ac6fbafc4b74a97b60319b8693fed85bf5f543c SHA1 0b9d71f89f03886b6787b20a8a81b1c90f309813 SHA256 4917a622521cf49e5d6d7498673d0e58fbe85ac2f2489ebf8053b0a06a3e516a DIST Pixie-src-2.0.2.tgz 5240765 RMD160 740bc2fc2d200c9831ecf165ec22224f01a92581 SHA1 aa1716262985140bc7842c76d6fad96635723369 SHA256 29e484139d972541bd927d98425e4b9499c0557298e097855b09bd5955e9131d -EBUILD pixie-1.7.6.ebuild 1183 RMD160 57053b2b2a9089bca2bea3725f55d20d09e92979 SHA1 aa79b9d8009a2c3b75fc6b37a87eb2c851ed1b2b SHA256 94d8094eba1425d7e1fc53a99c805ab167bbe94ffb9e86732da0a28821a02cb9 -MD5 c6e5c377471e58174d9ff03a01936094 pixie-1.7.6.ebuild 1183 -RMD160 57053b2b2a9089bca2bea3725f55d20d09e92979 pixie-1.7.6.ebuild 1183 -SHA256 94d8094eba1425d7e1fc53a99c805ab167bbe94ffb9e86732da0a28821a02cb9 pixie-1.7.6.ebuild 1183 -EBUILD pixie-2.0.2-r1.ebuild 1044 RMD160 6af4131b5207109f9bfbc46ad0a57bc73a040e15 SHA1 7f219eb938c61f4b47612cd5b5dc6830d26398f0 SHA256 20618277c3638d4b8b294061e9f2afc8e8663c4839720eb314fbd468f77f60aa -MD5 0344cbcadac8a1a49c4ac3300c40c400 pixie-2.0.2-r1.ebuild 1044 -RMD160 6af4131b5207109f9bfbc46ad0a57bc73a040e15 pixie-2.0.2-r1.ebuild 1044 -SHA256 20618277c3638d4b8b294061e9f2afc8e8663c4839720eb314fbd468f77f60aa pixie-2.0.2-r1.ebuild 1044 -MISC ChangeLog 5738 RMD160 c0ec229c5dcb0d5358a0b56be84904b6c2c6fb73 SHA1 eb6761673e8fc827649f7dfbb2eb5b3c87f085be SHA256 50fbe8883ce0f6610d6503eb3013de458cbc60a78f38d1e6de3ca9fddfcd8047 -MD5 835d782fc9ac70ef4ac067877f4a95d7 ChangeLog 5738 -RMD160 c0ec229c5dcb0d5358a0b56be84904b6c2c6fb73 ChangeLog 5738 -SHA256 50fbe8883ce0f6610d6503eb3013de458cbc60a78f38d1e6de3ca9fddfcd8047 ChangeLog 5738 +EBUILD pixie-1.7.6.ebuild 1300 RMD160 9b5ca9f41445cf94682af5e4c2cab3c85e7f159d SHA1 fa9772cd636b9269d25f83481c6ea7db94fc3ece SHA256 e24659c99e626d365a099734feba7a00beea559893816674c84f3cc7d87bb942 +MD5 b659c903f1176ac03a2bb3b89b627e38 pixie-1.7.6.ebuild 1300 +RMD160 9b5ca9f41445cf94682af5e4c2cab3c85e7f159d pixie-1.7.6.ebuild 1300 +SHA256 e24659c99e626d365a099734feba7a00beea559893816674c84f3cc7d87bb942 pixie-1.7.6.ebuild 1300 +EBUILD pixie-2.0.2-r1.ebuild 1069 RMD160 d7038f03ddcdc0edb5afc28bc3a759bf9631fb32 SHA1 e0dc1b0a7e9fec88f1e5424c9ab8a7dc9590691e SHA256 a226723da67339c19bd0654e872469e37854d53a3f9eb3a3282bc3c7af3c5204 +MD5 8328b05bb671255488c929f53fc612c3 pixie-2.0.2-r1.ebuild 1069 +RMD160 d7038f03ddcdc0edb5afc28bc3a759bf9631fb32 pixie-2.0.2-r1.ebuild 1069 +SHA256 a226723da67339c19bd0654e872469e37854d53a3f9eb3a3282bc3c7af3c5204 pixie-2.0.2-r1.ebuild 1069 +MISC ChangeLog 5895 RMD160 15c5002ba6a3592613ca8fcc7f888d62c4488755 SHA1 e8e016f87f85bf36b3e587f536836e0c50186ff6 SHA256 fabe16c16c6ed3f0de38d037180ce360ed3e1fe6151f6f9b037608c62794c497 +MD5 9035179c1c096f98f3c654472334628d ChangeLog 5895 +RMD160 15c5002ba6a3592613ca8fcc7f888d62c4488755 ChangeLog 5895 +SHA256 fabe16c16c6ed3f0de38d037180ce360ed3e1fe6151f6f9b037608c62794c497 ChangeLog 5895 MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259 @@ -29,10 +30,3 @@ SHA256 addf42412308b086e172a7e53b5a3f09de326b8715af73fc64e8621f9f187397 files/di MD5 211e5e7822bc6131df815816a6e1d948 files/digest-pixie-2.0.2-r1 241 RMD160 f36d5a3cca13daba797c2d42a46d1a3d45add5ac files/digest-pixie-2.0.2-r1 241 SHA256 0e2d4a05f971481c721e5259ed196eb43297bee4d19e7e454ab87fb364f20d5e files/digest-pixie-2.0.2-r1 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFF+DYUNQqtfCuFneMRAp5iAJ9YJ+96jTRrSnbDZITyDM0fw/iL8QCcCt2r -gKU4bU0g1BhtncWPdMaTfoo= -=UmBv ------END PGP SIGNATURE----- diff --git a/media-gfx/pixie/files/pixie-1.7.6-shader.patch b/media-gfx/pixie/files/pixie-1.7.6-shader.patch new file mode 100644 index 000000000000..5c75919cd4d3 --- /dev/null +++ b/media-gfx/pixie/files/pixie-1.7.6-shader.patch @@ -0,0 +1,12 @@ +--- Pixie/src/ri/shader-orig.h 2006-10-30 19:58:59.000000000 +0000 ++++ Pixie/src/ri/shader.h 2006-10-30 20:00:24.000000000 +0000 +@@ -374,6 +374,9 @@ public: + // Description : This class encapsulates a shader + // Comments : + // Date last edited : 3/13/2001 ++ ++CShader *parseShader(const char *,const char *); ++ + class CShader : public CFileResource { + public: + CShader(const char *); diff --git a/media-gfx/pixie/pixie-1.7.6.ebuild b/media-gfx/pixie/pixie-1.7.6.ebuild index 3ac1a2e098da..ee742443f19a 100644 --- a/media-gfx/pixie/pixie-1.7.6.ebuild +++ b/media-gfx/pixie/pixie-1.7.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.7.6.ebuild,v 1.3 2007/03/14 03:55:36 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.7.6.ebuild,v 1.4 2007/03/14 23:42:28 eradicator Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -38,6 +38,14 @@ src_unpack() { eautoreconf } +src_compile() { + strip-flags + replace-flags -O? -O2 + + econf || die "econf failed" + emake -j1 || die "Make failed" +} + src_install() { make DESTDIR="${D}" install || die diff --git a/media-gfx/pixie/pixie-2.0.2-r1.ebuild b/media-gfx/pixie/pixie-2.0.2-r1.ebuild index 92d8a2396b4d..7e8d2c9f30f9 100644 --- a/media-gfx/pixie/pixie-2.0.2-r1.ebuild +++ b/media-gfx/pixie/pixie-2.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-2.0.2-r1.ebuild,v 1.2 2007/03/14 17:52:16 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-2.0.2-r1.ebuild,v 1.3 2007/03/14 23:42:28 eradicator Exp $ IUSE="fltk openexr X" @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" RDEPEND="media-libs/jpeg sys-libs/zlib -- 2.26.2