diff options
| -rw-r--r-- | media-gfx/pixie/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/pixie/files/digest-pixie-1.5.1 | 3 | ||||
| -rw-r--r-- | media-gfx/pixie/files/digest-pixie-1.6.3 | 3 | ||||
| -rw-r--r-- | media-gfx/pixie/files/digest-pixie-1.7.6 | 3 | ||||
| -rw-r--r-- | media-gfx/pixie/files/pixie-1.4.4-math.patch | 37 | ||||
| -rw-r--r-- | media-gfx/pixie/files/pixie-1.4.7-libtool.patch | 428 | ||||
| -rw-r--r-- | media-gfx/pixie/files/pixie-1.6.3-libcommon.patch | 179 | ||||
| -rw-r--r-- | media-gfx/pixie/files/pixie-1.7.6-libcommon.patch | 185 | ||||
| -rw-r--r-- | media-gfx/pixie/pixie-1.5.1.ebuild | 61 | ||||
| -rw-r--r-- | media-gfx/pixie/pixie-1.6.3.ebuild | 52 | ||||
| -rw-r--r-- | media-gfx/pixie/pixie-1.7.6.ebuild | 52 |
11 files changed, 7 insertions, 1004 deletions
diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog index 76e003d64eab..35f6a8ddd4f6 100644 --- a/media-gfx/pixie/ChangeLog +++ b/media-gfx/pixie/ChangeLog @@ -1,6 +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.28 2007/03/12 17:23:26 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.29 2007/03/12 17:28:33 armin76 Exp $ + + 12 Mar 2007; Raúl Porcel <armin76@gentoo.org> + -files/pixie-1.4.4-math.patch, -files/pixie-1.4.7-libtool.patch, + -files/pixie-1.6.3-libcommon.patch, -files/pixie-1.7.6-libcommon.patch, + -pixie-1.5.1.ebuild, -pixie-1.6.3.ebuild, -pixie-1.7.6.ebuild: + punt oldish, broken, etc etc 12 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> pixie-2.0.2.ebuild: Stable on sparc wrt #160020 diff --git a/media-gfx/pixie/files/digest-pixie-1.5.1 b/media-gfx/pixie/files/digest-pixie-1.5.1 deleted file mode 100644 index f9f090dd0257..000000000000 --- a/media-gfx/pixie/files/digest-pixie-1.5.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 219ecbec4fabb7eebd81343aba54ea7c Pixie-src-1.5.1.tgz 473208 -RMD160 8fe5f8ee89c5b966196c1c85ec06f5a34358f52a Pixie-src-1.5.1.tgz 473208 -SHA256 678dc22f8f746f211b4cbe288fd2feb02b120fb419cccf3787d1f150e7901f2a Pixie-src-1.5.1.tgz 473208 diff --git a/media-gfx/pixie/files/digest-pixie-1.6.3 b/media-gfx/pixie/files/digest-pixie-1.6.3 deleted file mode 100644 index 6b3ec2c27e18..000000000000 --- a/media-gfx/pixie/files/digest-pixie-1.6.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fa36424619d5dda8515f009e01df2207 Pixie-src-1.6.3.tgz 6125284 -RMD160 d47f70fb6a9362d389c567a73d48dd2c2d4eb939 Pixie-src-1.6.3.tgz 6125284 -SHA256 19cd9aee4b360cde8bb12862b6e312498fd3a257d58d6d133150324a433180b6 Pixie-src-1.6.3.tgz 6125284 diff --git a/media-gfx/pixie/files/digest-pixie-1.7.6 b/media-gfx/pixie/files/digest-pixie-1.7.6 deleted file mode 100644 index 1172404b5720..000000000000 --- a/media-gfx/pixie/files/digest-pixie-1.7.6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 23b370f86f25c86ac1cc70d3efc219f6 Pixie-src-1.7.6.tgz 5258068 -RMD160 5ac6fbafc4b74a97b60319b8693fed85bf5f543c Pixie-src-1.7.6.tgz 5258068 -SHA256 4917a622521cf49e5d6d7498673d0e58fbe85ac2f2489ebf8053b0a06a3e516a Pixie-src-1.7.6.tgz 5258068 diff --git a/media-gfx/pixie/files/pixie-1.4.4-math.patch b/media-gfx/pixie/files/pixie-1.4.4-math.patch deleted file mode 100644 index 880f4e0b9f43..000000000000 --- a/media-gfx/pixie/files/pixie-1.4.4-math.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naurp Pixie.orig/src/common/global.h Pixie/src/common/global.h ---- Pixie.orig/src/common/global.h 2005-07-18 11:49:02.000000000 +0000 -+++ Pixie/src/common/global.h 2005-07-18 12:00:41.000000000 +0000 -@@ -47,6 +47,9 @@ - #ifndef GLOBAL_H - #define GLOBAL_H - -+#include <math.h> -+#include <values.h> -+ - // The Pixie version - #define VERSION_RELEASE 1 - #define VERSION_BETA 4 -@@ -63,9 +66,23 @@ - #undef C_EPSILON - #endif - -+#ifndef INFINITY - #define C_INFINITY (float) 1e30 -+#else -+#define C_INFINITY INFINITY -+#endif -+ -+#ifndef MINFLOAT - #define C_EPSILON (float) 1e-6 -+#else -+#define C_EPSILON MINFLOAT -+#endif -+ -+#ifndef M_PI - #define C_PI 3.141592653589793238462643383279502884197169399375105820974944592308 -+#else -+#define C_PI M_PI -+#endif - - // Logic constants - #define TRUE 1 diff --git a/media-gfx/pixie/files/pixie-1.4.7-libtool.patch b/media-gfx/pixie/files/pixie-1.4.7-libtool.patch deleted file mode 100644 index 665fd7f25c0d..000000000000 --- a/media-gfx/pixie/files/pixie-1.4.7-libtool.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff -Naurp Pixie.orig/Makefile.am Pixie/Makefile.am ---- Pixie.orig/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -1,30 +1,4 @@ - SUBDIRS = src -- --if SELFCONTAINED -- pixdatadir = $(prefix) -- docdir = $(prefix) -- htmldocdir = $(docdir)/html -- shaderdir = $(pixdatadir)/shaders --else -- pixdatadir = $(libdir)/$(PACKAGE) -- docdir = $(datadir)/doc/$(PACKAGE) -- htmldocdir = $(docdir)/html -- shaderdir = $(pixdatadir)/shaders --endif -- --doc_DATA = README AUTHORS LICENSE COPYING -- - man_MANS = man/rndr.1 man/sdrc.1 man/sdrinfo.1 man/texmake.1 -- --EXTRA_DIST = DEVNOTES LICENSE -- --dist-hook: -- cp -rf $(srcdir)/doc $(distdir) -- cp -rf $(srcdir)/shaders $(distdir) -- --install-data-hook: -- mkdir -p $(htmldocdir) -- cp -rf $(srcdir)/doc/* $(htmldocdir) -- mkdir -p $(shaderdir) -- cp -rf $(srcdir)/shaders/* $(shaderdir) -- -+doc_DATA = AUTHORS ChangeLog COPYING DEVNOTES LICENSE NEWS README doc/* -+shader_DATA = shaders/* -diff -Naurp Pixie.orig/configure.in Pixie/configure.in ---- Pixie.orig/configure.in 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/configure.in 2005-10-02 23:33:31.000000000 +0000 -@@ -14,6 +14,7 @@ dnl - AC_PROG_CC - AC_PROG_CPP - AC_PROG_CXX -+AM_DISABLE_STATIC - AM_PROG_LIBTOOL - AC_PROG_INSTALL - AC_PROG_MAKE_SET -@@ -94,17 +95,80 @@ AC_SUBST(TIFF_LIBS) - AC_SUBST(BUILD_SHOW) - - dnl --------------------------------------------------- -+dnl Set custom directories for shaders, models, procedurals, and displays -+dnl -+ -+AC_ARG_WITH(docdir, -+ AS_HELP_STRING([--with-docdir=DIR],[directory where we install documentation (Default: DATADIR/doc/Pixie)]), -+ docdir="${withval}", -+ docdir="${datadir}/doc/Pixie") -+ -+AC_ARG_WITH(shaderdir, -+ AS_HELP_STRING([--with-shaderdir=DIR],[directory where we store shaders (Default: DATADIR/Pixie/shaders)]), -+ shaderdir="${withval}", -+ shaderdir="${datadir}/Pixie/shaders") -+ -+AC_ARG_WITH(modeldir, -+ AS_HELP_STRING([--with-modeldir=DIR],[directory where we store models (Default: DATADIR/Pixie/models)]), -+ modeldir="${withval}", -+ modeldir="${datadir}/Pixie/models") -+ -+AC_ARG_WITH(texturedir, -+ AS_HELP_STRING([--with-modeldir=DIR],[directory where we store models (Default: DATADIR/Pixie/textures)]), -+ texturedir="${withval}", -+ texturedir="${datadir}/Pixie/textures") -+ -+AC_ARG_WITH(proceduraldir, -+ AS_HELP_STRING([--with-shaderdir=DIR],[directory to store shaders (Default: LIBDIR/Pixie/procedurals)]), -+ proceduraldir="${withval}", -+ proceduraldir="${libdir}/Pixie/procedurals") -+ -+AC_ARG_WITH(displaysdir, -+ AS_HELP_STRING([--with-displaysdir=DIR],[directory to store displays (Default: LIBDIR/Pixie/displays)]), -+ displaysdir="${withval}", -+ displaysdir="${libdir}/Pixie/displays") -+ -+dnl --------------------------------------------------- - dnl Are we building for self contained distribution - dnl - - AC_ARG_ENABLE(selfcontained, --AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup]), -+AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup (overrides custom directory settings)]), - [case "${enableval}" in --yes) selfcontained=true ;; --no) selfcontained=false ;; --*) AC_MSG_ERROR(bad value ${enableval} for --enable-selfcontained) ;; --esac],[selfcontained=false]) --AM_CONDITIONAL(SELFCONTAINED, test x$selfcontained = xtrue) -+ yes) docdir="${prefix}/doc" -+ shaderdir="${prefix}/shaders" -+ modeldir="${prefix}/models" -+ texturedir="${prefix}/textures" -+ displaysdir="${prefix}/displays" -+ proceduraldir="${prefix}/procedurals" -+ ;; -+ no) ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-selfcontained) ;; -+esac]) -+ -+dnl --------------------------------------------------- -+dnl Now tell the c preprocessor and the Makefiles where stuff goes -+dnl -+ -+AC_DEFUN([AC_DEFINE_DIR], [ -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"[$]$2\"" -+ AC_SUBST($1, "$ac_define_dir") -+ AC_SUBST($2, "$ac_define_dir") -+ AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE -+]) -+ -+AC_DEFINE_DIR(PIXIE_DOCS,docdir,[Directory where we store documentation]) -+AC_DEFINE_DIR(PIXIE_SHADERS,shaderdir,[Directory where we store shaders]) -+AC_DEFINE_DIR(PIXIE_MODELS,modeldir,[Directory where we store models]) -+AC_DEFINE_DIR(PIXIE_TEXTURES,texturedir,[Directory where we store textures]) -+AC_DEFINE_DIR(PIXIE_DISPLAYS,displaysdir,[Directory where we store displays]) -+AC_DEFINE_DIR(PIXIE_PROCEDURALS,proceduraldir,[Directory where we store procedurals]) - - dnl --------------------------------------------------- - dnl Write the output -@@ -118,10 +182,3 @@ echo ">make -install" - echo "to built Pixie" - echo - -- -- -- -- -- -- -- -diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am ---- Pixie.orig/src/common/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/common/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -1,6 +1,9 @@ --noinst_LIBRARIES = libcommon.a -- --libcommon_a_SOURCES = algebra.cpp os.cpp memoryman.cpp --libcommon_a_CFLAGS = -fPIC -DPIC --libcommon_a_CXXFLAGS = -fPIC -DPIC -- -+lib_LTLIBRARIES = libpixiecommon.la -+ -+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) -+ -+libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp -diff -Naurp Pixie.orig/src/common/os.h Pixie/src/common/os.h ---- Pixie.orig/src/common/os.h 2005-09-18 18:52:39.000000000 +0000 -+++ Pixie/src/common/os.h 2005-10-02 23:32:15.000000000 +0000 -@@ -73,8 +73,10 @@ typedef void *(*TFun)(void *); - #endif - - #include "global.h" --#include "../../config.h" - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - // Maximum length of a path - const int OS_MAX_PATH_LENGTH = 512; -diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am ---- Pixie.orig/src/file/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/file/Makefile.am 2005-10-02 23:33:45.000000000 +0000 -@@ -1,15 +1,7 @@ -- --if SELFCONTAINED -- displaysdir = $(prefix)/displays --else -- displaysdir = $(libdir)/$(PACKAGE)/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 -avoid-version - - INCLUDES = -I.. -diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am ---- Pixie.orig/src/framebuffer/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/framebuffer/Makefile.am 2005-10-02 23:33:53.000000000 +0000 -@@ -1,16 +1,9 @@ -+displays_LTLIBRARIES = framebuffer.la - --if SELFCONTAINED -- displaysdir = $(prefix)/displays --else -- displaysdir = $(libdir)/$(PACKAGE)/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 -avoid-version @X_LDFLAGS@ -+framebuffer_la_CXXFLAGS = @X_CFLAGS@ - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am ---- Pixie.orig/src/precomp/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/precomp/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -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-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/rgbe/Makefile.am 2005-10-02 23:34:01.000000000 +0000 -@@ -1,14 +1,7 @@ -- --if SELFCONTAINED -- displaysdir = $(prefix)/displays --else -- displaysdir = $(libdir)/$(PACKAGE)/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 -avoid-version - - INCLUDES = -I.. -diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am ---- Pixie.orig/src/ri/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/ri/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -1,6 +1,10 @@ - lib_LTLIBRARIES = libri.la - --LIBS = @TIFF_LIBS@ -+LIBRI_CURRENT_VERSION=0 -+LIBRI_REVISION_VERSION=0 -+LIBRI_AGE_VERSION=0 -+ -+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,8 +65,7 @@ libri_la_SOURCES = attributes.cpp \ - xform.cpp \ - zbuffer.cpp - --libri_la_LIBADD = ../common/libcommon.a --libri_la_LDFLAGS = -version-info 0:0:0 -+libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/ri/options.cpp Pixie/src/ri/options.cpp ---- Pixie.orig/src/ri/options.cpp 2005-09-18 18:52:38.000000000 +0000 -+++ Pixie/src/ri/options.cpp 2005-10-02 23:32:15.000000000 +0000 -@@ -37,6 +37,10 @@ - #include "renderer.h" - #include "stats.h" - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - /////////////////////////////////////////////////////////////////////// - // Class : COptions - // Method : optionsDeleteSearchPath -@@ -256,18 +260,38 @@ COptions::COptions() { - - hider = strdup("stochastic"); - -- archivePath = optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%",NULL); -+#ifndef PIXIE_MODELS -+#define PIXIE_MODELS "%PIXIEHOME%/models" -+#endif -+ -+#ifndef PIXIE_PROCEDURALS -+#define PIXIE_PROCEDURALS "%PIXIE_PROCEDURALS%" -+#endif -+ -+#ifndef PIXIE_TEXTURES -+#define PIXIE_TEXTURES "%PIXIEHOME%/textures" -+#endif -+ -+#ifndef PIXIE_SHADERS -+#define PIXIE_SHADERS "%PIXIEHOME%/shaders" -+#endif -+ -+#ifndef PIXIE_DISPLAYS -+#define PIXIE_DISPLAYS "%PIXIE_DISPLAY%" -+#endif -+ -+ archivePath = optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%:" PIXIE_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_TEXTURES,NULL); -+ shaderPath = optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%:" PIXIE_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_DISPLAYS,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-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/rndr/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -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-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/sdr/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -1,9 +1,14 @@ - 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_LDFLAGS = -version-info 0:0:0 -+libsdr_la_LIBADD = ../common/libpixiecommon.la - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am ---- Pixie.orig/src/sdrc/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/sdrc/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -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-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/sdrinfo/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -1,7 +1,7 @@ - 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.. - -diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am ---- Pixie.orig/src/show/Makefile.am 2005-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/show/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -4,8 +4,6 @@ endif - - EXTRA_DIST = *.h show.dsp - --CFLAGS = @CFLAGS@ @X_CFLAGS@ -- - show_SOURCES = cacheView.cpp \ - radView.cpp \ - interface.cpp \ -@@ -13,7 +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-09-18 18:52:42.000000000 +0000 -+++ Pixie/src/texmake/Makefile.am 2005-10-02 23:32:15.000000000 +0000 -@@ -1,7 +1,7 @@ - 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.. - diff --git a/media-gfx/pixie/files/pixie-1.6.3-libcommon.patch b/media-gfx/pixie/files/pixie-1.6.3-libcommon.patch deleted file mode 100644 index ab0a54172a39..000000000000 --- a/media-gfx/pixie/files/pixie-1.6.3-libcommon.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am ---- Pixie.orig/src/common/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/common/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,10 +1,9 @@ --lib_LTLIBRARIES = libcommon.la -+lib_LTLIBRARIES = libpixiecommon.la - --LIBCOMMON_CURRENT_VERSION=0 --LIBCOMMON_REVISION_VERSION=0 --LIBCOMMON_AGE_VERSION=0 -+LIBPIXIECOMMON_CURRENT_VERSION=0 -+LIBPIXIECOMMON_REVISION_VERSION=0 -+LIBPIXIECOMMON_AGE_VERSION=0 - --libcommon_la_LDFLAGS = -export-dynamic -version-info $(LIBCOMMON_CURRENT_VERSION):$(LIBCOMMON_REVISION_VERSION):$(LIBCOMMON_AGE_VERSION) -+libpixiecommon_la_LDFLAGS = -export-dynamic -version-info $(LIBPIXIECOMMON_CURRENT_VERSION):$(LIBPIXIECOMMON_REVISION_VERSION):$(LIBPIXIECOMMON_AGE_VERSION) - --libcommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp -- -+libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp -diff -Naurp Pixie.orig/src/common/os.h Pixie/src/common/os.h ---- Pixie.orig/src/common/os.h 2006-04-22 16:36:42.000000000 -0700 -+++ Pixie/src/common/os.h 2006-05-05 17:33:54.000000000 -0700 -@@ -32,7 +32,10 @@ - #define OS_H - - #include "global.h" --#include "../../config.h" -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #ifdef WIN32 - // >> WIN32 -diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am ---- Pixie.orig/src/file/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/file/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,7 +1,7 @@ - displays_LTLIBRARIES = file.la - - file_la_SOURCES = file.cpp --file_la_LIBADD = ../common/libcommon.la @TIFF_LIBS@ -+file_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ - file_la_LDFLAGS = -module -avoid-version - - INCLUDES = -I.. -diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am ---- Pixie.orig/src/framebuffer/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/framebuffer/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,7 +1,7 @@ - displays_LTLIBRARIES = framebuffer.la - - framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp --framebuffer_la_LIBADD = ../common/libcommon.la @X_LIBS@ -+framebuffer_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@ - framebuffer_la_LDFLAGS = -module -avoid-version @X_LDFLAGS@ - framebuffer_la_CXXFLAGS = @X_CFLAGS@ - -diff -Naurp Pixie.orig/src/openexr/Makefile.am Pixie/src/openexr/Makefile.am ---- Pixie.orig/src/openexr/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/openexr/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -3,7 +3,7 @@ if BUILD_OPENEXR - endif - - openexr_la_SOURCES = openexr.cpp --openexr_la_LIBADD = ../common/libcommon.la @OPENEXR_LIBS@ -+openexr_la_LIBADD = ../common/libpixiecommon.la @OPENEXR_LIBS@ - openexr_la_LDFLAGS = -module -avoid-version - - INCLUDES = -I.. @OPENEXR_INCLUDES@ -diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am ---- Pixie.orig/src/precomp/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/precomp/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -2,7 +2,7 @@ noinst_PROGRAMS = precomp - - precomp_SOURCES = precomp.cpp - --precomp_LDADD = ../common/libcommon.la -+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 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/rgbe/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,7 +1,7 @@ - displays_LTLIBRARIES = rgbe.la - - rgbe_la_SOURCES = file.cpp rgbe.cpp --rgbe_la_LIBADD = ../common/libcommon.la -+rgbe_la_LIBADD = ../common/libpixiecommon.la - rgbe_la_LDFLAGS = -module -avoid-version - - INCLUDES = -I.. -diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am ---- Pixie.orig/src/ri/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/ri/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -66,7 +66,7 @@ libri_la_SOURCES = attributes.cpp \ - xform.cpp \ - zbuffer.cpp - --libri_la_LIBADD = ../common/libcommon.la @TIFF_LIBS@ -+libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am ---- Pixie.orig/src/rndr/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/rndr/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,7 +1,7 @@ - bin_PROGRAMS = rndr - - rndr_SOURCES = rndr.cpp --rndr_LDADD = ../ri/libri.la ../common/libcommon.la -+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 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/sdr/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -8,7 +8,7 @@ libsdr_la_LDFLAGS = -export-dynamic -ver - - libsdr_la_SOURCES = sdr.cpp - --libsdr_la_LIBADD = ../common/libcommon.la -+libsdr_la_LIBADD = ../common/libpixiecommon.la - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am ---- Pixie.orig/src/sdrc/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/sdrc/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -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.la -+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 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/sdrinfo/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,7 +1,7 @@ - bin_PROGRAMS = sdrinfo - - sdrinfo_SOURCES = sdrinfo.cpp --sdrinfo_LDADD = ../sdr/libsdr.la ../common/libcommon.la -+sdrinfo_LDADD = ../sdr/libsdr.la ../common/libpixiecommon.la - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am ---- Pixie.orig/src/show/Makefile.am 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/show/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -12,7 +12,7 @@ show_SOURCES = cacheView.cpp \ - imageView.cpp \ - show.cpp - --show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ @TIFF_LIBS@ ../common/libcommon.la -+show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ @TIFF_LIBS@ ../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 2006-04-22 16:36:46.000000000 -0700 -+++ Pixie/src/texmake/Makefile.am 2006-05-05 17:33:54.000000000 -0700 -@@ -1,7 +1,7 @@ - bin_PROGRAMS = texmake - - texmake_SOURCES = texmake.cpp --texmake_LDADD = ../ri/libri.la ../common/libcommon.la -+texmake_LDADD = ../ri/libri.la ../common/libpixiecommon.la - - INCLUDES = -I.. - diff --git a/media-gfx/pixie/files/pixie-1.7.6-libcommon.patch b/media-gfx/pixie/files/pixie-1.7.6-libcommon.patch deleted file mode 100644 index aee8e009db22..000000000000 --- a/media-gfx/pixie/files/pixie-1.7.6-libcommon.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am ---- Pixie.orig/src/common/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/common/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -1,11 +1,10 @@ --lib_LTLIBRARIES = libcommon.la -+lib_LTLIBRARIES = libpixiecommon.la - --LIBCOMMON_CURRENT_VERSION=0 --LIBCOMMON_REVISION_VERSION=0 --LIBCOMMON_AGE_VERSION=0 -+LIBPIXIECOMMON_CURRENT_VERSION=0 -+LIBPIXIECOMMON_REVISION_VERSION=0 -+LIBPIXIECOMMON_AGE_VERSION=0 - --libcommon_la_LDFLAGS = -export-dynamic -version-info $(LIBCOMMON_CURRENT_VERSION):$(LIBCOMMON_REVISION_VERSION):$(LIBCOMMON_AGE_VERSION) -+libpixiecommon_la_LDFLAGS = -export-dynamic -version-info $(LIBPIXIECOMMON_CURRENT_VERSION):$(LIBPIXIECOMMON_REVISION_VERSION):$(LIBPIXIECOMMON_AGE_VERSION) - --libcommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp -- -+libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp - -diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am ---- Pixie.orig/src/file/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/file/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -1,7 +1,7 @@ - displays_LTLIBRARIES = file.la - - file_la_SOURCES = file.cpp --file_la_LIBADD = ../common/libcommon.la @TIFF_LIBS@ -+file_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ - file_la_LDFLAGS = -module -avoid-version - - INCLUDES = -I.. -diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am ---- Pixie.orig/src/framebuffer/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/framebuffer/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -3,7 +3,7 @@ displays_LTLIBRARIES = framebuffer.la - endif - - framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp --framebuffer_la_LIBADD = ../common/libcommon.la @X_LIBS@ -+framebuffer_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@ - framebuffer_la_LDFLAGS = -module -avoid-version @X_LDFLAGS@ - framebuffer_la_CXXFLAGS = @X_CFLAGS@ - -diff -Naurp Pixie.orig/src/gui/Makefile.am Pixie/src/gui/Makefile.am ---- Pixie.orig/src/gui/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/gui/Makefile.am 2007-02-12 04:32:46.000000000 +0000 -@@ -4,14 +4,14 @@ if BUILD_SHOW - endif - - #gui_la_SOURCES = opengl.cpp --#gui_la_LIBADD = ../common/libcommon.la @QT_LIBS@ -+#gui_la_LIBADD = ../common/libpixiecommon.la @QT_LIBS@ - #gui_la_CXXFLAGS = $(AM_CXXFLAGS) @QT_CXXFLAGS@ - #gui_la_LDFLAGS = -module -avoid-version @QT_LDFLAGS@ - # - #INCLUDES = -I.. @QT_INCLUDES@ - - gui_la_SOURCES = opengl.cpp --gui_la_LIBADD = ../common/libcommon.la @X_LIBS@ -+gui_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@ - gui_la_CXXFLAGS = $(AM_CXXFLAGS) @X_CFLAGS@ @FLTK_CXXFLAGS@ - gui_la_LDFLAGS = -module -avoid-version @FLTK_LDFLAGS@ @X_LDFLAGS@ - -diff -Naurp Pixie.orig/src/openexr/Makefile.am Pixie/src/openexr/Makefile.am ---- Pixie.orig/src/openexr/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/openexr/Makefile.am 2007-02-12 04:30:28.000000000 +0000 -@@ -3,7 +3,7 @@ if BUILD_OPENEXR - endif - - openexr_la_SOURCES = openexr.cpp --openexr_la_LIBADD = ../common/libcommon.la @OPENEXR_LIBS@ -+openexr_la_LIBADD = ../common/libpixiecommon.la @OPENEXR_LIBS@ - openexr_la_LDFLAGS = -module -avoid-version @OPENEXR_LDFLAGS@ - - INCLUDES = -I.. @OPENEXR_INCLUDES@ -diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am ---- Pixie.orig/src/precomp/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/precomp/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -2,7 +2,7 @@ noinst_PROGRAMS = precomp - - precomp_SOURCES = precomp.cpp - --precomp_LDADD = ../common/libcommon.la -+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 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/rgbe/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -1,7 +1,7 @@ - displays_LTLIBRARIES = rgbe.la - - rgbe_la_SOURCES = file.cpp rgbe.cpp --rgbe_la_LIBADD = ../common/libcommon.la -+rgbe_la_LIBADD = ../common/libpixiecommon.la - rgbe_la_LDFLAGS = -module -avoid-version - - INCLUDES = -I.. -diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am ---- Pixie.orig/src/ri/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/ri/Makefile.am 2007-02-12 04:30:59.000000000 +0000 -@@ -69,7 +69,7 @@ libri_la_SOURCES = attributes.cpp \ - xform.cpp \ - zbuffer.cpp - --libri_la_LIBADD = ../common/libcommon.la @TIFF_LIBS@ @ZLIB_LIBS@ -+libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ @ZLIB_LIBS@ - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am ---- Pixie.orig/src/rndr/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/rndr/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -1,7 +1,7 @@ - bin_PROGRAMS = rndr - - rndr_SOURCES = rndr.cpp --rndr_LDADD = ../ri/libri.la ../common/libcommon.la -+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 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/sdr/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -8,7 +8,7 @@ libsdr_la_LDFLAGS = -export-dynamic -ver - - libsdr_la_SOURCES = sdr.cpp - --libsdr_la_LIBADD = ../common/libcommon.la -+libsdr_la_LIBADD = ../common/libpixiecommon.la - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am ---- Pixie.orig/src/sdrc/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/sdrc/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -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.la -+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 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/sdrinfo/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -1,7 +1,7 @@ - bin_PROGRAMS = sdrinfo - - sdrinfo_SOURCES = sdrinfo.cpp --sdrinfo_LDADD = ../sdr/libsdr.la ../common/libcommon.la -+sdrinfo_LDADD = ../sdr/libsdr.la ../common/libpixiecommon.la - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am ---- Pixie.orig/src/show/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/show/Makefile.am 2007-02-12 04:29:48.000000000 +0000 -@@ -6,7 +6,7 @@ EXTRA_DIST = *.h show.dsp - - show_SOURCES = show.cpp - --show_LDADD = ../common/libcommon.la ../ri/libri.la -+show_LDADD = ../common/libpixiecommon.la ../ri/libri.la - - INCLUDES = -I.. - -diff -Naurp Pixie.orig/src/texmake/Makefile.am Pixie/src/texmake/Makefile.am ---- Pixie.orig/src/texmake/Makefile.am 2006-10-14 01:52:39.000000000 +0000 -+++ Pixie/src/texmake/Makefile.am 2007-02-12 04:28:52.000000000 +0000 -@@ -1,7 +1,7 @@ - bin_PROGRAMS = texmake - - texmake_SOURCES = texmake.cpp --texmake_LDADD = ../ri/libri.la ../common/libcommon.la -+texmake_LDADD = ../ri/libri.la ../common/libpixiecommon.la - - INCLUDES = -I.. - diff --git a/media-gfx/pixie/pixie-1.5.1.ebuild b/media-gfx/pixie/pixie-1.5.1.ebuild deleted file mode 100644 index bcc51041984d..000000000000 --- a/media-gfx/pixie/pixie-1.5.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.5.1.ebuild,v 1.2 2006/04/01 05:54:58 eradicator 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="-amd64 ~ppc sparc x86" - -RDEPEND="media-libs/jpeg - sys-libs/zlib - media-libs/tiff - X? ( || ( x11-libs/libXext virtual/x11 ) )" - -DEPEND="${RDEPEND} - sys-devel/libtool - >=sys-devel/automake-1.8" - -src_unpack() { - unpack ${A} - - cd ${S} - # These have been sent upstream, and rejected, but this is the - # "right way" -- eradicator - epatch ${FILESDIR}/${PN}-1.4.4-math.patch - - # Make the build process more cross-platform... - epatch ${FILESDIR}/${PN}-1.4.7-libtool.patch - - export WANT_AUTOMAKE=1.8 - export WANT_AUTOCONF=2.5 - libtoolize --force --copy || die - aclocal || die - automake -a -f -c || die - autoheader || die - autoconf || die -} - -src_install() { - make DESTDIR="${D}" install || die - - keepdir /usr/$(get_libdir)/Pixie/procedurals - keepdir /usr/share/Pixie/models - - insinto /usr/share/Pixie/textures - doins ${S}/textures/checkers.tif - - edos2unix ${D}/usr/share/Pixie/shaders/* - mv ${D}/usr/share/doc/Pixie ${D}/usr/share/doc/${PF} -} diff --git a/media-gfx/pixie/pixie-1.6.3.ebuild b/media-gfx/pixie/pixie-1.6.3.ebuild deleted file mode 100644 index 6177a6bcedc3..000000000000 --- a/media-gfx/pixie/pixie-1.6.3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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.6.3.ebuild,v 1.2 2007/01/04 15:07:44 flameeyes Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -IUSE="X openexr" - -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="-amd64 ~ppc ~sparc ~x86" - -RDEPEND="media-libs/jpeg - sys-libs/zlib - media-libs/tiff - openexr? ( media-libs/openexr ) - X? ( || ( x11-libs/libXext virtual/x11 ) )" - -src_unpack() { - unpack ${A} - - cd "${S}" - - # Don't install a lib with a name like 'libcommon'. Renaming it to libpixiecommon - epatch ${FILESDIR}/${PN}-1.6.3-libcommon.patch - - eautoreconf -} - -src_install() { - make DESTDIR="${D}" install || die - - keepdir /usr/$(get_libdir)/Pixie/procedurals - keepdir /usr/share/Pixie/models - - insinto /usr/share/Pixie/textures - doins ${S}/textures/checkers.tif - - edos2unix ${D}/usr/share/Pixie/shaders/* - mv ${D}/usr/share/doc/Pixie ${D}/usr/share/doc/${PF} -} diff --git a/media-gfx/pixie/pixie-1.7.6.ebuild b/media-gfx/pixie/pixie-1.7.6.ebuild deleted file mode 100644 index 0e5e4330d3ef..000000000000 --- a/media-gfx/pixie/pixie-1.7.6.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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.1 2007/02/12 04:44:59 eradicator Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -IUSE="X openexr" - -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="-amd64 ~ppc ~sparc ~x86" - -RDEPEND="media-libs/jpeg - sys-libs/zlib - media-libs/tiff - openexr? ( media-libs/openexr ) - X? ( || ( x11-libs/libXext virtual/x11 ) )" - -src_unpack() { - unpack ${A} - - cd "${S}" - - # Don't install a lib with a name like 'libcommon'. Renaming it to libpixiecommon - epatch ${FILESDIR}/${PN}-1.7.6-libcommon.patch - - eautoreconf -} - -src_install() { - make DESTDIR="${D}" install || die - - keepdir /usr/$(get_libdir)/Pixie/procedurals - keepdir /usr/share/Pixie/models - - insinto /usr/share/Pixie/textures - doins ${S}/textures/checkers.tif - - edos2unix ${D}/usr/share/Pixie/shaders/* - mv ${D}/usr/share/doc/Pixie ${D}/usr/share/doc/${PF} -} |