diff options
| author | ahoka <ahoka> | 2009-09-20 08:13:21 +0000 |
|---|---|---|
| committer | ahoka <ahoka> | 2009-09-20 08:13:21 +0000 |
| commit | fa80bbc9331b12d6a4e1c9910a6d809028ad5866 (patch) | |
| tree | 4b33a35e3037d4d69e430ea75980a6016c19d62b /multimedia | |
| parent | a63084ecf220c6a9d04ba192a50762650c1856e3 (diff) | |
| download | pkgsrc-fa80bbc9331b12d6a4e1c9910a6d809028ad5866.tar.gz | |
Add patch from pkg/42000 to fix cpu detection on powerpc.
Closes PR pkg/42000
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-powerpc | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index aeaab74a13a..7092dc2f8a5 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2009/08/30 11:01:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.53 2009/09/20 08:13:21 ahoka Exp $ -PKGREVISION= 2 +PKGREVISION= 3 MAINTAINER= ahoka@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 13b9a09f1ee..73f917bea3a 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2009/09/07 20:05:30 ahoka Exp $ +$NetBSD: distinfo,v 1.29 2009/09/20 08:13:21 ahoka Exp $ SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a @@ -6,3 +6,4 @@ Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0 +SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a diff --git a/multimedia/ffmpeg/patches/patch-powerpc b/multimedia/ffmpeg/patches/patch-powerpc new file mode 100644 index 00000000000..dee96541867 --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-powerpc @@ -0,0 +1,16 @@ +$NetBSD: patch-powerpc,v 1.1 2009/09/20 08:13:21 ahoka Exp $ + +Fixes pkg/42000, not necessary aftert the next upgrade. + +--- libswscale/swscale.c.orig 2009-06-04 23:55:52.000000000 +0200 ++++ libswscale/swscale.c +@@ -1307,7 +1307,9 @@ static inline void monoblack2Y(uint8_t * + + #if ARCH_PPC + #if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL ++#if !CONFIG_RUNTIME_CPUDETECT + #undef COMPILE_C ++#endif + #define COMPILE_ALTIVEC + #endif + #endif //ARCH_PPC |