diff options
author | he <he> | 2009-02-21 14:39:03 +0000 |
---|---|---|
committer | he <he> | 2009-02-21 14:39:03 +0000 |
commit | 5b5af382d7600e23a0757f4d56534d6c09a6ab61 (patch) | |
tree | 0dfab424daec454206299eaca7a57ca1f1fa58a9 /devel/liboil | |
parent | fa7242f7f088ab16a736d04236fc2652f5eb3fce (diff) | |
download | pkgsrc-5b5af382d7600e23a0757f4d56534d6c09a6ab61.tar.gz |
Upgrade from version 0.3.15 to 0.3.15nb1.
Pkgsrc changes:
o Provide proper detection of altivec on NetBSD powerpc ports.
As an added bonus, this now builds on NetBSD/macppc 3.1 where
it didn't earlier.
Diffstat (limited to 'devel/liboil')
-rw-r--r-- | devel/liboil/Makefile | 3 | ||||
-rw-r--r-- | devel/liboil/distinfo | 3 | ||||
-rw-r--r-- | devel/liboil/patches/patch-ad | 68 |
3 files changed, 72 insertions, 2 deletions
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile index c363d71158e..3db7f2ffa8a 100644 --- a/devel/liboil/Makefile +++ b/devel/liboil/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2009/01/28 10:01:29 sketch Exp $ +# $NetBSD: Makefile,v 1.20 2009/02/21 14:39:03 he Exp $ # DISTNAME= liboil-0.3.15 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://liboil.freedesktop.org/download/ diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo index 1e99a9510b3..81c4fb3e2c6 100644 --- a/devel/liboil/distinfo +++ b/devel/liboil/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2009/01/26 14:08:13 sketch Exp $ +$NetBSD: distinfo,v 1.16 2009/02/21 14:39:03 he Exp $ SHA1 (liboil-0.3.15.tar.gz) = 8791e3399aae619b89a1d00f40ffcafc7d7f5d9b RMD160 (liboil-0.3.15.tar.gz) = ba6a4889dd8c16f62dee5c238e019b42066e6a9b @@ -6,3 +6,4 @@ Size (liboil-0.3.15.tar.gz) = 822195 bytes SHA1 (patch-aa) = 363219c8afee30ac07f73278f127de01d6a5b689 SHA1 (patch-ab) = 13ff4bef610a28174a2a41b74029f24f04fd598f SHA1 (patch-ac) = 4559e8b635099d96df59bcc5525eb3c0322720ba +SHA1 (patch-ad) = 25fdf7e3b007325c33b6b4be4bd58f543d6be514 diff --git a/devel/liboil/patches/patch-ad b/devel/liboil/patches/patch-ad new file mode 100644 index 00000000000..ba075769a97 --- /dev/null +++ b/devel/liboil/patches/patch-ad @@ -0,0 +1,68 @@ +$NetBSD: patch-ad,v 1.4 2009/02/21 14:39:03 he Exp $ + +Provide proper detection of altivec on NetBSD/powerpc ports. + +--- liboil/liboilcpu-powerpc.c.orig 2008-06-30 19:57:33.000000000 +0000 ++++ liboil/liboilcpu-powerpc.c +@@ -59,6 +59,12 @@ + #include <sys/sysctl.h> + #endif + ++#if defined(__NetBSD__) ++#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#endif ++ + + /***** powerpc *****/ + +@@ -70,7 +76,7 @@ oil_profile_stamp_tb(void) + return ts; + } + +-#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) && !defined(__NetBSD__) + static void + test_altivec (void * ignored) + { +@@ -78,6 +84,21 @@ test_altivec (void * ignored) + } + #endif + ++#if defined(__NetBSD__) ++static void ++oil_check_altivec_sysctl_netbsd (void) ++{ ++ int ret, av; ++ size_t len; ++ ++ len = sizeof(av); ++ ret = sysctlbyname("machdep.altivec", &av, &len, NULL, 0); ++ if (!ret && av) { ++ oil_cpu_flags |= OIL_IMPL_FLAG_ALTIVEC; ++ } ++} ++#endif ++ + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + static void + oil_check_altivec_sysctl_freebsd (void) +@@ -158,7 +179,7 @@ out: + } + #endif + +-#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) && !defined(__NetBSD__) + static void + oil_check_altivec_fault (void) + { +@@ -176,6 +197,8 @@ oil_cpu_detect_arch(void) + { + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + oil_check_altivec_sysctl_freebsd(); ++#elif defined(__NetBSD__) ++ oil_check_altivec_sysctl_netbsd(); + #elif defined(__APPLE__) + oil_check_altivec_sysctl_darwin(); + #elif defined(__linux__) |