diff options
Diffstat (limited to 'media-gfx/pixie')
| -rw-r--r-- | media-gfx/pixie/ChangeLog | 10 | ||||
| -rw-r--r-- | media-gfx/pixie/Manifest | 18 | ||||
| -rw-r--r-- | media-gfx/pixie/files/50pixie | 2 | ||||
| -rw-r--r-- | media-gfx/pixie/files/digest-pixie-1.3.13 | 1 | ||||
| -rw-r--r-- | media-gfx/pixie/files/digest-pixie-1.3.25 | 1 | ||||
| -rw-r--r-- | media-gfx/pixie/files/digest-pixie-1.4.3 | 1 | ||||
| -rw-r--r-- | media-gfx/pixie/files/pixie-1.3.11-gentoo.patch | 13 | ||||
| -rw-r--r-- | media-gfx/pixie/files/pixie-1.4.3-libtool.patch | 312 | ||||
| -rw-r--r-- | media-gfx/pixie/pixie-1.3.13.ebuild | 63 | ||||
| -rw-r--r-- | media-gfx/pixie/pixie-1.4.3.ebuild (renamed from media-gfx/pixie/pixie-1.3.25.ebuild) | 34 |
10 files changed, 341 insertions, 114 deletions
diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog index 296f47db6654..8bce5f1dd091 100644 --- a/media-gfx/pixie/ChangeLog +++ b/media-gfx/pixie/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/pixie # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.14 2005/06/19 21:11:07 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.15 2005/07/11 05:42:23 eradicator Exp $ + +*pixie-1.4.3 (11 Jul 2005) + + 11 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> + -files/pixie-1.3.11-gentoo.patch, +files/pixie-1.4.3-libtool.patch, + -files/50pixie, -pixie-1.3.13.ebuild, -pixie-1.3.25.ebuild, + +pixie-1.4.3.ebuild: + Version bump closes bug #98469. 19 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org> pixie-1.4.1-r1.ebuild: diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest index a2f3df977e5c..5f2eb252ca2e 100644 --- a/media-gfx/pixie/Manifest +++ b/media-gfx/pixie/Manifest @@ -1,22 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 0c212f71ed9f3ffe6d67818c9f5baf9c ChangeLog 2604 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259 -MD5 f527bfb56eb2999a02d359762f0dcf36 pixie-1.3.13.ebuild 1267 MD5 2890bc643293ec454fd2898947845ac4 pixie-1.4.1-r1.ebuild 1351 -MD5 373bae549435ce6df4838dd65ab2e99f pixie-1.3.25.ebuild 1362 +MD5 32242e4aca506cff39170cca6e63059a pixie-1.4.3.ebuild 1421 MD5 cb8ed959bdd211afc4edb2b0607b5f66 files/50pixie 41 -MD5 0dfa6fd77d94a955564026aa73d37a78 files/digest-pixie-1.3.13 66 +MD5 8ea32b3b4562c521a38f87e3c14a50ef files/digest-pixie-1.4.3 65 MD5 9c2746d29b44d65086d1464a94f0ef9f files/pixie-1.4.1-libtool.patch 9889 -MD5 cba609fd7007536313603a2b6e721b07 files/digest-pixie-1.3.25 66 -MD5 44355ed7501f8b6bb524b9c6aa348dc7 files/pixie-1.3.11-gentoo.patch 417 MD5 6cc5b77de73a722c5e850636bf750a32 files/pixie-1.3.11-math.patch 365 MD5 c47cd24a306a2475680ce9f914546c4e files/digest-pixie-1.4.1-r1 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCtdiMArHZZzCEUG0RAvlvAJ4uk7WyzD3QuNQ3cNH/AZptFBApbACfdk81 -8Oegtksb5sdgkHQJXlhHGQk= -=JUmB ------END PGP SIGNATURE----- +MD5 da4d408607ca14407b0f38ef4f81e7f6 files/pixie-1.4.3-libtool.patch 10594 diff --git a/media-gfx/pixie/files/50pixie b/media-gfx/pixie/files/50pixie deleted file mode 100644 index 56e72e02309d..000000000000 --- a/media-gfx/pixie/files/50pixie +++ /dev/null @@ -1,2 +0,0 @@ -PATH=/opt/pixie/bin -PIXIEHOME=/opt/pixie diff --git a/media-gfx/pixie/files/digest-pixie-1.3.13 b/media-gfx/pixie/files/digest-pixie-1.3.13 deleted file mode 100644 index 43fe8121a314..000000000000 --- a/media-gfx/pixie/files/digest-pixie-1.3.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 f543bbb6bb5ae37bdd4d32ee34ac78a6 Pixie-src-1.3.13.tgz 4878613 diff --git a/media-gfx/pixie/files/digest-pixie-1.3.25 b/media-gfx/pixie/files/digest-pixie-1.3.25 deleted file mode 100644 index a4953c91c40e..000000000000 --- a/media-gfx/pixie/files/digest-pixie-1.3.25 +++ /dev/null @@ -1 +0,0 @@ -MD5 f0a726a007f7f35f6d13d56bbb4ebd29 Pixie-src-1.3.25.tgz 4973521 diff --git a/media-gfx/pixie/files/digest-pixie-1.4.3 b/media-gfx/pixie/files/digest-pixie-1.4.3 new file mode 100644 index 000000000000..2c7a9f6c3481 --- /dev/null +++ b/media-gfx/pixie/files/digest-pixie-1.4.3 @@ -0,0 +1 @@ +MD5 b534707bfcde35da5992172d4da9ac92 Pixie-src-1.4.3.tgz 4709778 diff --git a/media-gfx/pixie/files/pixie-1.3.11-gentoo.patch b/media-gfx/pixie/files/pixie-1.3.11-gentoo.patch deleted file mode 100644 index 58a9753f6c4a..000000000000 --- a/media-gfx/pixie/files/pixie-1.3.11-gentoo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur Pixie.Makefile/Makefile.am Pixie.gentoo/Makefile.am ---- Pixie.Makefile/Makefile.am 2004-06-14 18:33:41.169944272 -0700 -+++ Pixie.gentoo/Makefile.am 2004-06-14 18:33:00.459761090 -0700 -@@ -1,9 +1,5 @@ - SUBDIRS = src - --topdir = $(prefix) -- --top_DATA = README AUTHORS LICENSE COPYING -- - EXTRA_DIST = Pixie.dsw Pixie.ncb Pixie.opt DEVNOTES LICENSE makeclean.bat makeinst.bat tutorials win32inst - - dist-hook: diff --git a/media-gfx/pixie/files/pixie-1.4.3-libtool.patch b/media-gfx/pixie/files/pixie-1.4.3-libtool.patch new file mode 100644 index 000000000000..78d14d0935c4 --- /dev/null +++ b/media-gfx/pixie/files/pixie-1.4.3-libtool.patch @@ -0,0 +1,312 @@ +diff -Naurp Pixie.orig/Makefile.am Pixie/Makefile.am +--- Pixie.orig/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/Makefile.am 2005-07-09 15:36:50.000000000 +0200 +@@ -6,14 +6,12 @@ if SELFCONTAINED + htmldocdir = $(docdir)/html + shaderdir = $(pixdatadir)/shaders + else +- pixdatadir = $(libdir)/$(PACKAGE) +- docdir = $(datadir)/doc/$(PACKAGE) ++ pixdatadir = $(datadir)/pixie ++ docdir = $(datadir)/pixie/doc + htmldocdir = $(docdir)/html + shaderdir = $(pixdatadir)/shaders + endif + +-doc_DATA = README AUTHORS LICENSE COPYING +- + EXTRA_DIST = Pixie.dsw Pixie.ncb Pixie.opt DEVNOTES LICENSE makeclean.bat makeinst.bat win32inst + + dist-hook: +@@ -21,8 +19,7 @@ dist-hook: + cp -rf $(srcdir)/shaders $(distdir) + + install-data-hook: +- mkdir -p $(htmldocdir) +- cp -rf $(srcdir)/doc/* $(htmldocdir) +- mkdir -p $(shaderdir) +- cp -rf $(srcdir)/shaders/* $(shaderdir) +- ++ mkdir -p $(DESTDIR)/$(htmldocdir) ++ cp -rf $(srcdir)/doc/* $(DESTDIR)/$(htmldocdir) ++ mkdir -p $(DESTDIR)/$(shaderdir) ++ cp -rf $(srcdir)/shaders/* $(DESTDIR)/$(shaderdir) +diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am +--- Pixie.orig/src/common/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/common/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,9 +1,11 @@ +-noinst_LIBRARIES = libcommon.a ++lib_LTLIBRARIES = libpixiecommon.la + +-libcommon_a_SOURCES = algebra.cpp os.cpp memoryman.cpp +-libcommon_a_CFLAGS = -fPIC -DPIC +-libcommon_a_CXXFLAGS = -fPIC -DPIC ++LIBPIXIECOMMON_CURRENT_VERSION=0 ++LIBPIXIECOMMON_REVISION_VERSION=0 ++LIBPIXIECOMMON_AGE_VERSION=0 + ++libpixiecommon_la_LDFLAGS = -export-dynamic -version-info $(LIBPIXIECOMMON_CURRENT_VERSION):$(LIBPIXIECOMMON_REVISION_VERSION):$(LIBPIXIECOMMON_AGE_VERSION) + +-EXTRA_DIST = *.h *.cpp *.dsp ++libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp + ++EXTRA_DIST = *.h *.cpp *.dsp +diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am +--- Pixie.orig/src/file/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/file/Makefile.am 2005-07-09 15:43:10.000000000 +0200 +@@ -1,18 +1,15 @@ +- + if SELFCONTAINED + displaysdir = $(prefix)/displays + else +- displaysdir = $(libdir)/$(PACKAGE)/displays ++ displaysdir = $(libdir)/pixie/displays + endif + + displays_LTLIBRARIES = file.la + +-LIBS = @TIFF_LIBS@ + file_la_SOURCES = file.cpp +-file_la_LIBADD = ../common/libcommon.a ++file_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ + file_la_LDFLAGS = -module + + INCLUDES = -I.. + + EXTRA_DIST = *cpp *.dsp +- +diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am +--- Pixie.orig/src/framebuffer/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/framebuffer/Makefile.am 2005-07-09 15:47:24.000000000 +0200 +@@ -1,19 +1,16 @@ +- + if SELFCONTAINED + displaysdir = $(prefix)/displays + else +- displaysdir = $(libdir)/$(PACKAGE)/displays ++ displaysdir = $(libdir)/pixie/displays + endif + + displays_LTLIBRARIES = framebuffer.la + +-CFLAGS = @CFLAGS@ @X_CFLAGS@ + framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp +-framebuffer_la_LIBADD = ../common/libcommon.a @X_LIBS@ ++framebuffer_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@ + framebuffer_la_LDFLAGS = -module @X_LDFLAGS@ ++framebuffer_la_CXXFLAGS = @X_CFLAGS@ + + INCLUDES = -I.. + + EXTRA_DIST = *.h *.cpp *.dsp +- +- +diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am +--- Pixie.orig/src/precomp/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/precomp/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -2,7 +2,7 @@ bin_PROGRAMS = precomp + + precomp_SOURCES = precomp.cpp + +-precomp_LDADD = ../common/libcommon.a ++precomp_LDADD = ../common/libpixiecommon.la + + INCLUDES = -I.. + +diff -Naurp Pixie.orig/src/rgbe/Makefile.am Pixie/src/rgbe/Makefile.am +--- Pixie.orig/src/rgbe/Makefile.am 2005-07-09 15:43:37.000000000 +0200 ++++ Pixie/src/rgbe/Makefile.am 2005-07-09 15:45:12.000000000 +0200 +@@ -1,17 +1,15 @@ +- + if SELFCONTAINED + displaysdir = $(prefix)/displays + else +- displaysdir = $(libdir)/$(PACKAGE)/displays ++ displaysdir = $(libdir)/pixie/displays + endif + + displays_LTLIBRARIES = rgbe.la + + rgbe_la_SOURCES = file.cpp rgbe.cpp +-rgbe_la_LIBADD = ../common/libcommon.a ++rgbe_la_LIBADD = ../common/libpixiecommon.la + rgbe_la_LDFLAGS = -module + + INCLUDES = -I.. + + EXTRA_DIST = *.h *.cpp *.dsp +- +diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am +--- Pixie.orig/src/ri/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/ri/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,6 +1,11 @@ + lib_LTLIBRARIES = libri.la + +-LIBS = @TIFF_LIBS@ ++LIBRI_CURRENT_VERSION=0 ++LIBRI_REVISION_VERSION=0 ++LIBRI_AGE_VERSION=0 ++ ++libri_la_CPPFLAGS = -DPIXIE_PROCEDURALS=\"@libdir@/pixie/procedurals\" -DPIXIE_DISPLAY=\"@libdir@/pixie/displays\" -DPIXIE_SHAREDIR=\"@datadir@/pixie\" ++libri_la_LDFLAGS = -export-dynamic -version-info $(LIBRI_CURRENT_VERSION):$(LIBRI_REVISION_VERSION):$(LIBRI_AGE_VERSION) + libri_la_SOURCES = attributes.cpp \ + bundles.cpp \ + cache.cpp \ +@@ -61,12 +66,10 @@ libri_la_SOURCES = attributes.cpp \ + xform.cpp \ + zbuffer.cpp + +-libri_la_LIBADD = ../common/libcommon.a ++libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ + + INCLUDES = -I.. + +-includedir = $(prefix)/include +- + include_HEADERS = ri.h dsply.h shadeop.h implicit.h dlo.h + + EXTRA_DIST = *.h *.h *.cpp *.dsp *.l *.y readme.txt +diff -Naurp Pixie.orig/src/ri/options.cpp Pixie/src/ri/options.cpp +--- Pixie.orig/src/ri/options.cpp 2005-07-07 04:53:47.000000000 +0200 ++++ Pixie/src/ri/options.cpp 2005-07-09 12:44:45.000000000 +0200 +@@ -256,18 +256,30 @@ COptions::COptions() { + + hider = strdup("stochastic"); + +- archivePath = optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%",NULL); ++#ifndef PIXIE_SHAREDIR ++#define PIXIE_SHAREDIR "%PIXIEHOME%" ++#endif ++ ++#ifndef PIXIE_PROCEDURALS ++#define PIXIE_PROCEDURALS "%PIXIE_PROCEDURALS%" ++#endif ++ ++#ifndef PIXIE_DISPLAY ++#define PIXIE_DISPLAY "%PIXIE_DISPLAY%" ++#endif ++ ++ archivePath = optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%:" PIXIE_SHAREDIR "/models",NULL); + #ifdef _DEBUG +- proceduralPath = optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/bind:%PROCEDURALS%",NULL); ++ proceduralPath = optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/bind:%PIXIE_PROCEDURALS%:%PROCEDURALS%",NULL); + #else +- proceduralPath = optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/lib:%PROCEDURALS%",NULL); ++ proceduralPath = optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/lib:%PIXIE_PROCEDURALS%:%PROCEDURALS%:" PIXIE_PROCEDURALS,NULL); + #endif +- texturePath = optionsGetSearchPath(".:%PIXIEHOME%/textures:%TEXTURES%",NULL); +- shaderPath = optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%",NULL); ++ texturePath = optionsGetSearchPath(".:%PIXIEHOME%/textures:%TEXTURES%:" PIXIE_SHAREDIR "/textures",NULL); ++ shaderPath = optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%:" PIXIE_SHAREDIR "/shaders",NULL); + #ifdef _DEBUG +- displayPath = optionsGetSearchPath(".:%PIXIEHOME%/bind:%DISPLAYS%",NULL); ++ displayPath = optionsGetSearchPath(".:%PIXIEHOME%/bind:%PIXIE_DISPLAY%:%DISPLAYS%",NULL); + #else +- displayPath = optionsGetSearchPath(".:%PIXIEHOME%/displays:%DISPLAYS%",NULL); ++ displayPath = optionsGetSearchPath(".:%PIXIEHOME%/displays:%PIXIE_DISPLAY%:%DISPLAYS%:" PIXIE_DISPLAY,NULL); + #endif + temporaryPath = strdup("temp"); + +diff -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am +--- Pixie.orig/src/rndr/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/rndr/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,7 +1,7 @@ + bin_PROGRAMS = rndr + + rndr_SOURCES = rndr.cpp +-rndr_LDADD = ../ri/libri.la ../common/libcommon.a ++rndr_LDADD = ../ri/libri.la ../common/libpixiecommon.la + + INCLUDES = -I.. + +diff -Naurp Pixie.orig/src/sdr/Makefile.am Pixie/src/sdr/Makefile.am +--- Pixie.orig/src/sdr/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/sdr/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,13 +1,17 @@ + lib_LTLIBRARIES = libsdr.la + ++LIBSDR_CURRENT_VERSION=0 ++LIBSDR_REVISION_VERSION=0 ++LIBSDR_AGE_VERSION=0 ++ ++libsdr_la_LDFLAGS = -export-dynamic -version-info $(LIBSDR_CURRENT_VERSION):$(LIBSDR_REVISION_VERSION):$(LIBSDR_AGE_VERSION) ++ + libsdr_la_SOURCES = sdr.cpp + +-libsdr_la_LIBADD = ../common/libcommon.a ++libsdr_la_LIBADD = ../common/libpixiecommon.la + + INCLUDES = -I.. + +-includedir = $(prefix)/include +- + include_HEADERS = sdr.h + + EXTRA_DIST = *.h *.cpp *.l *.y *.dsp +diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am +--- Pixie.orig/src/sdrc/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/sdrc/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,7 +1,7 @@ + bin_PROGRAMS = sdrc + + sdrc_SOURCES = sdrc.cpp dso.cpp expression.cpp opcodes.cpp sdr.cpp sl.cpp pp1.c pp2.c pp3.c pp4.c pp5.c pp6.c pp7.c pp8.c +-sdrc_LDADD = ../common/libcommon.a ++sdrc_LDADD = ../common/libpixiecommon.la + + INCLUDES = -I.. + +diff -Naurp Pixie.orig/src/sdrinfo/Makefile.am Pixie/src/sdrinfo/Makefile.am +--- Pixie.orig/src/sdrinfo/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/sdrinfo/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,9 +1,8 @@ + bin_PROGRAMS = sdrinfo + + sdrinfo_SOURCES = sdrinfo.cpp +-sdrinfo_LDADD = ../sdr/libsdr.la ../common/libcommon.a ++sdrinfo_LDADD = ../sdr/libsdr.la ../common/libpixiecommon.la + + INCLUDES = -I.. + + EXTRA_DIST = *.cpp *.dsp +- +diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am +--- Pixie.orig/src/show/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/show/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -4,8 +4,6 @@ endif + + EXTRA_DIST = *.h show.dsp + +-CFLAGS = @CFLAGS@ @X_CFLAGS@ +- + show_SOURCES = cacheView.cpp \ + radView.cpp \ + interface.cpp \ +@@ -13,12 +11,7 @@ show_SOURCES = cacheView.cpp \ + photonView.cpp \ + show.cpp + +-show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libcommon.a ++show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libpixiecommon.la ++show_CXXFLAGS = @X_CFLAGS@ + + INCLUDES = -I.. +- +- +- +- +- +- +diff -Naurp Pixie.orig/src/texmake/Makefile.am Pixie/src/texmake/Makefile.am +--- Pixie.orig/src/texmake/Makefile.am 2005-07-07 04:53:53.000000000 +0200 ++++ Pixie/src/texmake/Makefile.am 2005-07-08 19:27:59.000000000 +0200 +@@ -1,9 +1,8 @@ + bin_PROGRAMS = texmake + + texmake_SOURCES = texmake.cpp +-texmake_LDADD = ../ri/libri.la ../common/libcommon.a ++texmake_LDADD = ../ri/libri.la ../common/libpixiecommon.la + + INCLUDES = -I.. + + EXTRA_DIST = *.cpp *.dsp +- diff --git a/media-gfx/pixie/pixie-1.3.13.ebuild b/media-gfx/pixie/pixie-1.3.13.ebuild deleted file mode 100644 index ee9cfb778112..000000000000 --- a/media-gfx/pixie/pixie-1.3.13.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.13.ebuild,v 1.4 2004/12/29 06:07:58 mr_bones_ Exp $ - -inherit eutils - -IUSE="X" - -MY_PN="Pixie" -S="${WORKDIR}/${MY_PN}" - -DESCRIPTION="RenderMan like photorealistic renderer." -HOMEPAGE="http://pixie.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz" - -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="x86 ~ppc sparc -amd64" - -RDEPEND="media-libs/jpeg - sys-libs/zlib - media-libs/tiff - X? ( virtual/x11 )" - -DEPEND="${RDEPEND} - sys-devel/libtool - >=sys-devel/automake-1.8" - -src_unpack() { - unpack ${A} - - cd ${S} - # These have been sent upstream - epatch ${FILESDIR}/${PN}-1.3.11-math.patch - - # Gentoo-specific stuff - epatch ${FILESDIR}/${PN}-1.3.11-gentoo.patch - - export WANT_AUTOMAKE=1.8 - export WANT_AUTOCONF=2.5 - aclocal - libtoolize --force --copy - automake -a -f -c - autoconf -} - -src_compile() { - ./configure --prefix=/opt/pixie || die - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - dodoc AUTHORS ChangeLog DEVNOTES NEWS README - - insinto /etc/env.d - doins ${FILESDIR}/50pixie - - edos2unix ${D}/opt/pixie/shaders/* - - mv ${D}/opt/pixie/doc ${D}/usr/share/doc/${PF}/html -} diff --git a/media-gfx/pixie/pixie-1.3.25.ebuild b/media-gfx/pixie/pixie-1.4.3.ebuild index 3faae844929e..fe520b1f7a5e 100644 --- a/media-gfx/pixie/pixie-1.3.25.ebuild +++ b/media-gfx/pixie/pixie-1.4.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.25.ebuild,v 1.2 2004/12/29 06:07:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.3.ebuild,v 1.1 2005/07/11 05:42:23 eradicator Exp $ inherit eutils @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc -amd64" +KEYWORDS="-amd64 ~ppc ~sparc ~x86" RDEPEND="media-libs/jpeg sys-libs/zlib @@ -35,30 +35,28 @@ src_unpack() { # "right way" -- eradicator epatch ${FILESDIR}/${PN}-1.3.11-math.patch - # Gentoo-specific stuff to fix the build/install process - epatch ${FILESDIR}/${PN}-1.3.11-gentoo.patch + # Make the build process more cross-platform... + # Also rejected upstream -- eradicator + epatch ${FILESDIR}/${PN}-1.4.3-libtool.patch export WANT_AUTOMAKE=1.8 export WANT_AUTOCONF=2.5 - aclocal - libtoolize --force --copy - automake -a -f -c - autoconf + libtoolize --force --copy || die + aclocal || die + automake -a -f -c || die + autoconf || die } src_compile() { - ./configure --prefix=/opt/pixie || die - emake || die + econf --disable-static || die + emake -j1 || die } src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog DEVNOTES NEWS README - insinto /etc/env.d - doins ${FILESDIR}/50pixie - - edos2unix ${D}/opt/pixie/shaders/* - - mv ${D}/opt/pixie/doc ${D}/usr/share/doc/${PF}/html + edos2unix ${D}/usr/share/pixie/shaders/* + mv ${D}/usr/share/pixie/doc/html ${D}/usr/share/doc/${PF}/html + rmdir ${D}/usr/share/pixie/doc } |