diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2007-07-11 06:32:24 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2007-07-11 06:32:24 +0000 |
commit | 8f20102c523d777bb945a8041f7efbcfd3828b70 (patch) | |
tree | aca1d028edabd0522818667d46d1f2d64d63651f /media-gfx/pixie/files | |
parent | Version bump. (diff) | |
download | historical-8f20102c523d777bb945a8041f7efbcfd3828b70.tar.gz historical-8f20102c523d777bb945a8041f7efbcfd3828b70.tar.bz2 historical-8f20102c523d777bb945a8041f7efbcfd3828b70.zip |
Removing old version.
Package-Manager: portage-2.1.3_rc7
Diffstat (limited to 'media-gfx/pixie/files')
-rw-r--r-- | media-gfx/pixie/files/digest-pixie-2.1.1-r1 | 3 | ||||
-rw-r--r-- | media-gfx/pixie/files/pixie-2.1.1-configure_paths.patch | 51 | ||||
-rw-r--r-- | media-gfx/pixie/files/pixie-2.1.1-gettimeofday.patch | 73 | ||||
-rw-r--r-- | media-gfx/pixie/files/pixie-2.1.1-mutex.patch | 34 |
4 files changed, 0 insertions, 161 deletions
diff --git a/media-gfx/pixie/files/digest-pixie-2.1.1-r1 b/media-gfx/pixie/files/digest-pixie-2.1.1-r1 deleted file mode 100644 index ffc0d1f87d68..000000000000 --- a/media-gfx/pixie/files/digest-pixie-2.1.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 81b62392a92da19cc8f5047b380c0139 Pixie-src-2.1.1.tgz 5288114 -RMD160 31dc23361cb1d2a2f6a8e3ab3544ec8fdbb4a660 Pixie-src-2.1.1.tgz 5288114 -SHA256 68e83bff9803acb0103aa31a1751f504f05d67e2960a45f6d43dee27f2447e61 Pixie-src-2.1.1.tgz 5288114 diff --git a/media-gfx/pixie/files/pixie-2.1.1-configure_paths.patch b/media-gfx/pixie/files/pixie-2.1.1-configure_paths.patch deleted file mode 100644 index 8d753f9a77d3..000000000000 --- a/media-gfx/pixie/files/pixie-2.1.1-configure_paths.patch +++ /dev/null @@ -1,51 +0,0 @@ -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]) - diff --git a/media-gfx/pixie/files/pixie-2.1.1-gettimeofday.patch b/media-gfx/pixie/files/pixie-2.1.1-gettimeofday.patch deleted file mode 100644 index 0617f57b3657..000000000000 --- a/media-gfx/pixie/files/pixie-2.1.1-gettimeofday.patch +++ /dev/null @@ -1,73 +0,0 @@ -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 -+} diff --git a/media-gfx/pixie/files/pixie-2.1.1-mutex.patch b/media-gfx/pixie/files/pixie-2.1.1-mutex.patch deleted file mode 100644 index a6d8ac672ec1..000000000000 --- a/media-gfx/pixie/files/pixie-2.1.1-mutex.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 |