[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Add patch from pkg/42000 to fix cpu ...

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4777de520c9d
branches:  trunk
changeset: 399450:4777de520c9d
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Sun Sep 20 08:13:21 2009 +0000

description:
Add patch from pkg/42000 to fix cpu detection on powerpc.

Closes PR pkg/42000

diffstat:

 multimedia/ffmpeg/Makefile              |   4 ++--
 multimedia/ffmpeg/distinfo              |   3 ++-
 multimedia/ffmpeg/patches/patch-powerpc |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 07dbaf5cae5f -r 4777de520c9d multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Sun Sep 20 07:04:22 2009 +0000
+++ b/multimedia/ffmpeg/Makefile        Sun Sep 20 08:13:21 2009 +0000
@@ -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@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
diff -r 07dbaf5cae5f -r 4777de520c9d multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Sun Sep 20 07:04:22 2009 +0000
+++ b/multimedia/ffmpeg/distinfo        Sun Sep 20 08:13:21 2009 +0000
@@ -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 @@
 SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
 SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
 SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0
+SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a
diff -r 07dbaf5cae5f -r 4777de520c9d multimedia/ffmpeg/patches/patch-powerpc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg/patches/patch-powerpc   Sun Sep 20 08:13:21 2009 +0000
@@ -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