summaryrefslogtreecommitdiff
path: root/multimedia/x264-devel/patches/patch-ac
diff options
context:
space:
mode:
authordrochner <drochner>2010-05-04 18:18:57 +0000
committerdrochner <drochner>2010-05-04 18:18:57 +0000
commitea9ad89658a413a569b83c2be2a634fa5deb10b5 (patch)
tree2a6bfe29ffd0faabc0321e47d97ce9437b56d62e /multimedia/x264-devel/patches/patch-ac
parent443a0f96b1a375db50f88380a7366b9ff23278d5 (diff)
downloadpkgsrc-ea9ad89658a413a569b83c2be2a634fa5deb10b5.tar.gz
update to the 20090920 snapshot
The snapshot date is chosen for some reason: -vlc-1.0.6 (which I'll commit soon) needs an API change which was introduced on 20090813 -pkgsrc's ffmpeg can't deal with an API change which was done 20090921 (and is not easily updated)
Diffstat (limited to 'multimedia/x264-devel/patches/patch-ac')
-rw-r--r--multimedia/x264-devel/patches/patch-ac17
1 files changed, 4 insertions, 13 deletions
diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac
index fb89a28129f..b8d0f4685a2 100644
--- a/multimedia/x264-devel/patches/patch-ac
+++ b/multimedia/x264-devel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2010/05/04 18:18:57 drochner Exp $
---- common/cpu.c.orig 2009-04-05 21:01:48.000000000 +0200
+--- common/cpu.c.orig 2010-04-22 20:45:07.000000000 +0000
+++ common/cpu.c
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,7 @@
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
#include <sys/param.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>
-@@ -200,13 +200,13 @@ uint32_t x264_cpu_detect( void )
+@@ -226,13 +226,13 @@ uint32_t x264_cpu_detect( void )
#elif defined( ARCH_PPC )
@@ -27,12 +27,3 @@ $NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
#else
int selectors[2] = { CTL_HW, HW_VECTORUNIT };
-@@ -223,7 +223,7 @@ uint32_t x264_cpu_detect( void )
- return cpu;
- }
-
--#elif defined( SYS_LINUX )
-+#elif defined(SYS_LINUX) || defined(SYS_NETBSD)
- #include <signal.h>
- #include <setjmp.h>
- static sigjmp_buf jmpbuf;