# 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.36 2007/04/04 08:11:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.37 2007/04/05 03:44:42 eradicator Exp $
+
+*pixie-2.1.1-r1 (05 Apr 2007)
+
+ 05 Apr 2007; Jeremy Huddleston <eradicator@gentoo.org>
+ -files/pixie-1.7.6-libcommon.patch, -files/pixie-1.7.6-shader.patch,
+ +files/pixie-2.1.1-configure_paths.patch,
+ +files/pixie-2.1.1-gettimeofday.patch, +files/pixie-2.1.1-mutex.patch,
+ -pixie-1.7.6.ebuild, -pixie-2.1.1.ebuild, +pixie-2.1.1-r1.ebuild:
+ Removed old version. Revbumped 2.1.1 with some fixes I've sent upstream.
04 Apr 2007; Jeremy Huddleston <eradicator@gentoo.org>
pixie-2.0.2-r1.ebuild, pixie-2.1.1.ebuild:
------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
+AUX pixie-2.1.1-configure_paths.patch 2039 RMD160 e8825985db411154f4c7a977b6350688bab3f8b4 SHA1 1a004e348dd525674e92737d9542577bcb72fbfb SHA256 6eeed7c9bfd364eaae089cce122c1dc75c76ffc20d5e5e5d1cab1876f8d3e03c
+MD5 d22b863dc2afdc8c3dcbc524a19cf90a files/pixie-2.1.1-configure_paths.patch 2039
+RMD160 e8825985db411154f4c7a977b6350688bab3f8b4 files/pixie-2.1.1-configure_paths.patch 2039
+SHA256 6eeed7c9bfd364eaae089cce122c1dc75c76ffc20d5e5e5d1cab1876f8d3e03c files/pixie-2.1.1-configure_paths.patch 2039
+AUX pixie-2.1.1-gettimeofday.patch 2150 RMD160 4221bcff2561dc8673c2c95428da7a5817b02f4a SHA1 5b2c7be21ceafbba4de191aff0d0d1278f2e4c07 SHA256 c06a95e8a4ded4e5f391de1457681488d3aa767e06e65b61c134458680258aec
+MD5 f776465dc7f2e8a42977098a4720be35 files/pixie-2.1.1-gettimeofday.patch 2150
+RMD160 4221bcff2561dc8673c2c95428da7a5817b02f4a files/pixie-2.1.1-gettimeofday.patch 2150
+SHA256 c06a95e8a4ded4e5f391de1457681488d3aa767e06e65b61c134458680258aec files/pixie-2.1.1-gettimeofday.patch 2150
+AUX pixie-2.1.1-mutex.patch 1236 RMD160 d3554c0e9f89e7988cbdcf41920523c9092c5df7 SHA1 ad08ebb731e4e275bff32a47008ba18f38bae9e0 SHA256 6f57c2b7ce327b37df8c6eb81da0e6e1375f59bdd9bc7ece6261bbce6c40ffbb
+MD5 b6fc0047ae0b6bfa925c1eb257dae75b files/pixie-2.1.1-mutex.patch 1236
+RMD160 d3554c0e9f89e7988cbdcf41920523c9092c5df7 files/pixie-2.1.1-mutex.patch 1236
+SHA256 6f57c2b7ce327b37df8c6eb81da0e6e1375f59bdd9bc7ece6261bbce6c40ffbb files/pixie-2.1.1-mutex.patch 1236
DIST Pixie-src-2.0.2.tgz 5240765 RMD160 740bc2fc2d200c9831ecf165ec22224f01a92581 SHA1 aa1716262985140bc7842c76d6fad96635723369 SHA256 29e484139d972541bd927d98425e4b9499c0557298e097855b09bd5955e9131d
DIST Pixie-src-2.1.1.tgz 5288114 RMD160 31dc23361cb1d2a2f6a8e3ab3544ec8fdbb4a660 SHA1 749817946082b0c648a42441b3f8f8a6ed40a3fc SHA256 68e83bff9803acb0103aa31a1751f504f05d67e2960a45f6d43dee27f2447e61
-EBUILD pixie-1.7.6.ebuild 1554 RMD160 9f4fa1bfe22a0c6e34d8bbf06fa2c7f1f343fe14 SHA1 52664913f95a8776927ecee74b70f2c51a2eb061 SHA256 967aa5514f65e59ac1ee706f6965c2921276ccee4b923256feb8adcd8765838a
-MD5 2ee884f624337c466890af1993850246 pixie-1.7.6.ebuild 1554
-RMD160 9f4fa1bfe22a0c6e34d8bbf06fa2c7f1f343fe14 pixie-1.7.6.ebuild 1554
-SHA256 967aa5514f65e59ac1ee706f6965c2921276ccee4b923256feb8adcd8765838a pixie-1.7.6.ebuild 1554
EBUILD pixie-2.0.2-r1.ebuild 1339 RMD160 e4ab9261d250c43eb99e2aa015cc7b4d7089d048 SHA1 cd8b4a60b85eb4293c69ce352d01feb3a7b5fd8f SHA256 1f1a41fbb9b2bec98477e88f52db98276d4b98ccb7ce9539393e52aa3298eb0e
MD5 97e0d6530fd3b9a1564cdb5b065947fa pixie-2.0.2-r1.ebuild 1339
RMD160 e4ab9261d250c43eb99e2aa015cc7b4d7089d048 pixie-2.0.2-r1.ebuild 1339
SHA256 1f1a41fbb9b2bec98477e88f52db98276d4b98ccb7ce9539393e52aa3298eb0e pixie-2.0.2-r1.ebuild 1339
-EBUILD pixie-2.1.1.ebuild 1301 RMD160 89e198a8e7bad539e624533a8b83d7ab75b851b7 SHA1 2999a6b1c60dac2051f6425e5156e9b1927ab603 SHA256 c11b703effd3bc7be36180b8ccb5f11f69b6ae2424f6b8b3dba9d9ed3fdb6e1b
-MD5 8894daa0d5a0544f7c9113bc952d7df5 pixie-2.1.1.ebuild 1301
-RMD160 89e198a8e7bad539e624533a8b83d7ab75b851b7 pixie-2.1.1.ebuild 1301
-SHA256 c11b703effd3bc7be36180b8ccb5f11f69b6ae2424f6b8b3dba9d9ed3fdb6e1b pixie-2.1.1.ebuild 1301
-MISC ChangeLog 6642 RMD160 da54bed782ca5f13e50616ce387b42141d0b57b8 SHA1 928d451974a0500c362d2582309c89dbc7d1a09c SHA256 7d7a3eebff8e2a6f02270f2c70bc09818c89b3482c8cd10051b2cedc90e13b52
-MD5 72a02b9739434de0c5dd5bd0f7fe80af ChangeLog 6642
-RMD160 da54bed782ca5f13e50616ce387b42141d0b57b8 ChangeLog 6642
-SHA256 7d7a3eebff8e2a6f02270f2c70bc09818c89b3482c8cd10051b2cedc90e13b52 ChangeLog 6642
+EBUILD pixie-2.1.1-r1.ebuild 1538 RMD160 42711a2f4a9c7208851aa0f07a616ead1cc706a1 SHA1 9ab3d08f911e41aa2abf9325574ffac2673682e4 SHA256 f85c306dc1dc5744cc37913869c4e072d47d6de5563bdd2600e2e285553228fc
+MD5 88efcf70418f3620a1421716666d7ca2 pixie-2.1.1-r1.ebuild 1538
+RMD160 42711a2f4a9c7208851aa0f07a616ead1cc706a1 pixie-2.1.1-r1.ebuild 1538
+SHA256 f85c306dc1dc5744cc37913869c4e072d47d6de5563bdd2600e2e285553228fc pixie-2.1.1-r1.ebuild 1538
+MISC ChangeLog 7063 RMD160 966b44145143b857ba005c011685e3d6cdb2602d SHA1 1ff8f80a3323b85e8ea978f6d92326859ea069f0 SHA256 2ba9f9ebe8a244e9243da248bd265fb23f1c9c086e4d0ce46189fccab29189c0
+MD5 92e96bc89ca849aad14b33ab75fcad12 ChangeLog 7063
+RMD160 966b44145143b857ba005c011685e3d6cdb2602d ChangeLog 7063
+SHA256 2ba9f9ebe8a244e9243da248bd265fb23f1c9c086e4d0ce46189fccab29189c0 ChangeLog 7063
MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf
MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf metadata.xml 259
-MD5 fb2a466bd926c4f236a9a72a1e149dfe files/digest-pixie-1.7.6 241
-RMD160 aa403621f9f3de97dc976f9e327c59e6e233b12e files/digest-pixie-1.7.6 241
-SHA256 addf42412308b086e172a7e53b5a3f09de326b8715af73fc64e8621f9f187397 files/digest-pixie-1.7.6 241
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
-MD5 748d4c471c4a253ba6850bb6ac8a27bb files/digest-pixie-2.1.1 241
-RMD160 f1cd2451b98d78670ec1e81c073be3b15c8b3fff files/digest-pixie-2.1.1 241
-SHA256 13bf2487d9878e346963b46289690489845162856564426eb0e7b529982e76b9 files/digest-pixie-2.1.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGE13PjC1Anjf1NmMRAoxjAJ0apvEMFy9PkbQk/et8QToD2t1DwQCfXLqp
-XooCp27VPtARZUGMFNE0seo=
-=DDbp
------END PGP SIGNATURE-----
+MD5 748d4c471c4a253ba6850bb6ac8a27bb files/digest-pixie-2.1.1-r1 241
+RMD160 f1cd2451b98d78670ec1e81c073be3b15c8b3fff files/digest-pixie-2.1.1-r1 241
+SHA256 13bf2487d9878e346963b46289690489845162856564426eb0e7b529982e76b9 files/digest-pixie-2.1.1-r1 241
+++ /dev/null
-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
+++ /dev/null
-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..
-
+++ /dev/null
---- 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 *);
--- /dev/null
+Changes for pixie-2.1.1 required for compilation on NetBSD and probably
+other systems:
+
+1. Variable escaping wasn't done correctly in configure.in
+
+2. NetBSD includes dlopen() in libc rather than through libdl, so I added a
+ check for it in libc if configure doesn't find libdl.
+
+--- configure.in.orig 2007-03-30 22:03:04.000000000 -0700
++++ configure.in 2007-03-31 04:43:06.000000000 -0700
+@@ -23,7 +23,7 @@ AC_PROG_MAKE_SET
+ dnl ---------------------------------------------------
+ dnl Check standard libraries
+ dnl
+-AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],)
++AC_CHECK_LIB(dl, dlopen,,[AC_CHECK_LIB(c, dlopen,,[AC_MSG_ERROR([dlopen routine is not found])],)],)
+ AC_CHECK_LIB(m, sin,,[AC_MSG_ERROR([math library is not found])],)
+ AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],)
+
+@@ -200,13 +200,13 @@
+ AC_ARG_ENABLE(selfcontained,
+ AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup (overrides custom directory settings)]),
+ [case "${enableval}" in
+- yes) docdir="${prefix}/doc"
+- shaderdir="${prefix}/shaders"
+- modeldir="${prefix}/models"
+- texturedir="${prefix}/textures"
+- displaysdir="${prefix}/displays"
+- proceduraldir="${prefix}/procedurals"
+- modulesdir="${prefix}/modules"
++ yes) docdir="\${prefix}/doc"
++ shaderdir="\${prefix}/shaders"
++ modeldir="\${prefix}/models"
++ texturedir="\${prefix}/textures"
++ displaysdir="\${prefix}/displays"
++ proceduraldir="\${prefix}/procedurals"
++ modulesdir="\${prefix}/modules"
+ ;;
+ no) ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-selfcontained) ;;
+@@ -221,7 +221,8 @@
+ 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\""
++ eval ac_define_dir="[$]$2"
++ eval ac_define_dir="\"[$]ac_define_dir\""
+ AC_SUBST($1, "$ac_define_dir")
+ AC_SUBST($2, "$ac_define_dir")
+ AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+
--- /dev/null
+ftime() has been deprecated for years and on NetBSD it is no longer part
+of libc (it is provided in libcompat). I have updated src/common/os.cpp
+to use gettimeofday() instead and configure.in to no longer check for
+ftime(). gettimeofday() is defined by BSD4.3, SVr4, and POSIX whereas
+ftime() is defineed in BSD4.2 and deprecated in BSD4.3.
+
+Index: configure.in
+===================================================================
+--- configure.in (revision 678)
++++ configure.in (working copy)
+@@ -139,7 +139,7 @@
+
+ AC_FUNC_ALLOCA
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS(ftime gethostname gettimeofday mkdir rmdir socket strdup strstr strtod strtol)
++AC_CHECK_FUNCS(gethostname gettimeofday mkdir rmdir socket strdup strstr strtod strtol)
+
+ dnl ---------------------------------------------------
+ dnl Do variable substitution
+Index: src/common/os.cpp
+===================================================================
+--- src/common/os.cpp (revision 678)
++++ src/common/os.cpp (working copy)
+@@ -36,7 +36,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include <sys/timeb.h>
++#include <sys/time.h>
+
+ // Needed for OSX 10.2.x fix
+ #if defined(__APPLE__) || defined(__APPLE_CC__) // guard against __APPLE__ being undef from ftlk
+@@ -110,12 +110,13 @@
+ // Return Value : -
+ // Comments :
+ void osInit() {
+- timeb ti;
++ struct timeval ti;
++ struct timezone tz;
+
+- ftime(&ti);
++ gettimeofday(&ti, &tz);
+
+- osStartTimeSec = ti.time;
+- osStartTimeMsec = ti.millitm;
++ osStartTimeSec = ti.tv_sec;
++ osStartTimeMsec = ti.tv_usec;
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -369,11 +370,12 @@
+ // Return Value :
+ // Comments :
+ float osTime() {
+- timeb ti;
++ struct timeval ti;
++ struct timezone tz;
+
+- ftime(&ti);
++ gettimeofday(&ti, &tz);
+
+- return (float) (ti.time - osStartTimeSec) + (ti.millitm - osStartTimeMsec) / 1000.0f;
++ return (float) (ti.tv_sec - osStartTimeSec) + (ti.tv_usec - osStartTimeMsec) / 1000000.0f;
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -519,4 +521,4 @@
+ }
+ }
+ str[i] = '\0';
+-}
+\ No newline at end of file
++}
--- /dev/null
+NetBSD triggers a SIGABRT if you try yo destroy a mutex while it is locked.
+
+--- src/ri/reyes.cpp.orig 2007-03-31 14:00:41.000000000 -0700
++++ src/ri/reyes.cpp 2007-03-31 14:03:14.000000000 -0700
+@@ -245,7 +245,8 @@ CReyes::~CReyes() {
+ delete [] buckets;
+
+ // Get rid of the bucket mutex
+- osDeleteMutex(bucketMutex); // destroy the _locked_ mutex
++ osUnlock(bucketMutex); // unlock the mutex
++ osDeleteMutex(bucketMutex); // destroy the _unlocked_ mutex
+
+ // Update the global stats
+ stats.numRasterObjects += numObjects;
+@@ -1377,7 +1378,8 @@ void CReyes::deleteObject(CRasterObje
+ }
+ #else
+ // Delete the grid data
+- osDeleteMutex(dObject->mutex); // destroy the _locked_ mutex
++ osUnlock(dObject->mutex); // unlock the mutex
++ osDeleteMutex(dObject->mutex); // destroy the _unlocked_ mutex
+ delete [] dObject->next;
+ delete [] grid->vertices;
+ delete [] grid->bounds;
+@@ -1401,7 +1403,8 @@ void CReyes::deleteObject(CRasterObje
+ }
+ #else
+ // Delete the object data
+- osDeleteMutex(dObject->mutex); // destroy the _locked_ mutex
++ osUnlock(dObject->mutex); // unlock the mutex
++ osDeleteMutex(dObject->mutex); // destroy the _unlocked_ mutex
+ delete [] dObject->next;
+ delete dObject;
+ #endif
+++ /dev/null
-# 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.5 2007/03/29 01:31:25 eradicator Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-IUSE="fltk openexr 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
- openexr? ( media-libs/openexr )
- X? ( x11-libs/libXext )"
-
-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_compile() {
- strip-flags
- replace-flags -O? -O2
-
- ewarn "Compilation of pixie is memory intensive. If you experience problems, try"
- ewarn "removing -pipe from your CFLAGS. Additionally, disabling optimizations (-O0)"
- ewarn "will cause much less memory consumption. See bug #171367 for more info."
-
- econf || die "econf failed"
- emake -j1 || die "Make failed"
-}
-
-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}
-}
# 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.1.1.ebuild,v 1.2 2007/04/04 08:11:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-2.1.1-r1.ebuild,v 1.1 2007/04/05 03:44:42 eradicator Exp $
-inherit multilib
+inherit eutils multilib autotools
IUSE="fltk openexr X"
fltk? ( x11-libs/fltk )
X? ( x11-libs/libXext )"
+src_unpack() {
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-2.1.1-configure_paths.patch
+ epatch ${FILESDIR}/${PN}-2.1.1-gettimeofday.patch
+ epatch ${FILESDIR}/${PN}-2.1.1-mutex.patch
+
+ eautoreconf
+}
+
src_compile() {
ewarn "Compilation of pixie is memory intensive. If you experience problems, try"
ewarn "removing -pipe from your CFLAGS. Additionally, disabling optimizations (-O0)"
emake -j1 || die "Make failed"
}
-
src_install() {
make DESTDIR="${D}" install || die
projects / gentoo.git / commitdiff