736c828193
(I've just put back libtool support.) needed for update of ffmpeg which in turn is needed for updates of eg vlc and gst-plugin-ffmpeg
38 lines
1.1 KiB
Text
38 lines
1.1 KiB
Text
$NetBSD: patch-ac,v 1.7 2011/01/17 16:46:42 drochner Exp $
|
|
|
|
--- common/cpu.c.orig 2010-11-02 06:45:07.000000000 +0900
|
|
+++ common/cpu.c 2011-01-09 21:05:03.000000000 +0900
|
|
@@ -39,7 +39,7 @@
|
|
#include <sys/types.h>
|
|
#include <sys/sysctl.h>
|
|
#endif
|
|
-#if SYS_OPENBSD
|
|
+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
|
|
#include <sys/param.h>
|
|
#include <sys/sysctl.h>
|
|
#include <machine/cpu.h>
|
|
@@ -237,13 +237,13 @@
|
|
|
|
#elif ARCH_PPC
|
|
|
|
-#if SYS_MACOSX || SYS_OPENBSD
|
|
+#if defined(SYS_MACOSX) || defined(SYS_OPENBSD) || defined(SYS_NETBSD)
|
|
#include <sys/sysctl.h>
|
|
uint32_t x264_cpu_detect( void )
|
|
{
|
|
/* Thank you VLC */
|
|
uint32_t cpu = 0;
|
|
-#if SYS_OPENBSD
|
|
+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
|
|
int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
|
|
#else
|
|
int selectors[2] = { CTL_HW, HW_VECTORUNIT };
|
|
@@ -361,7 +361,7 @@
|
|
#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
|
|
int ncpu;
|
|
size_t length = sizeof( ncpu );
|
|
-#if SYS_OPENBSD
|
|
+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
|
|
int mib[2] = { CTL_HW, HW_NCPU };
|
|
if( sysctl(mib, 2, &ncpu, &length, NULL, 0) )
|
|
#else
|