[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg trick "configure" to accept the 2009...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93286588fcfa
branches:  trunk
changeset: 575169:93286588fcfa
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue May 04 18:33:43 2010 +0000

description:
trick "configure" to accept the 20090920 snapshot of x264-devel,
refine dependency pattern, bump PKGREVISION

diffstat:

 multimedia/ffmpeg/Makefile                |   4 ++--
 multimedia/ffmpeg/distinfo                |   4 ++--
 multimedia/ffmpeg/options.mk              |   7 +++++--
 multimedia/ffmpeg/patches/patch-configure |  13 +++++++++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 8cd9c7e60b10 -r 93286588fcfa multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Tue May 04 18:33:35 2010 +0000
+++ b/multimedia/ffmpeg/Makefile        Tue May 04 18:33:43 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2010/04/16 15:49:12 reed Exp $
+# $NetBSD: Makefile,v 1.60 2010/05/04 18:33:43 drochner Exp $
 
-PKGREVISION=   7
+PKGREVISION=   8
 
 MAINTAINER=    ahoka%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
diff -r 8cd9c7e60b10 -r 93286588fcfa multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Tue May 04 18:33:35 2010 +0000
+++ b/multimedia/ffmpeg/distinfo        Tue May 04 18:33:43 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2010/04/02 11:19:40 jmmv Exp $
+$NetBSD: distinfo,v 1.35 2010/05/04 18:33:43 drochner Exp $
 
 SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
@@ -10,4 +10,4 @@
 SHA1 (patch-ae) = a3d81de5fd49bee35f0bc3c78808f2b65a94288c
 SHA1 (patch-af) = 2507866ddc72c7e8ff10b489c86cb679e8e2fd49
 SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b
-SHA1 (patch-configure) = aaf72f92c3f8a7723681181e37ef72dce40ce405
+SHA1 (patch-configure) = 2676c15b2fccdf4cde817f6f143885b3faea2467
diff -r 8cd9c7e60b10 -r 93286588fcfa multimedia/ffmpeg/options.mk
--- a/multimedia/ffmpeg/options.mk      Tue May 04 18:33:35 2010 +0000
+++ b/multimedia/ffmpeg/options.mk      Tue May 04 18:33:43 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2010/04/16 15:49:12 reed Exp $
+# $NetBSD: options.mk,v 1.16 2010/05/04 18:33:43 drochner Exp $
 
 # Global and legacy options
 
@@ -75,7 +75,10 @@
 ###
 
 .if !empty(PKG_OPTIONS:Mx264)
-BUILDLINK_API_DEPENDS.x264-devel+=     x264-devel>=20071218
+# ABI change between 20090326 and 20090920
+BUILDLINK_API_DEPENDS.x264-devel+=     x264-devel>=20090920
+# incompatible API change on 20090921
+BUILDLINK_API_DEPENDS.x264-devel+=     x264-devel<20090921
 CONFIGURE_ARGS+=  --enable-libx264
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .endif
diff -r 8cd9c7e60b10 -r 93286588fcfa multimedia/ffmpeg/patches/patch-configure
--- a/multimedia/ffmpeg/patches/patch-configure Tue May 04 18:33:35 2010 +0000
+++ b/multimedia/ffmpeg/patches/patch-configure Tue May 04 18:33:43 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.9 2010/04/02 11:19:40 jmmv Exp $
+$NetBSD: patch-configure,v 1.10 2010/05/04 18:33:43 drochner Exp $
 
---- configure.orig     2009-06-10 22:50:53.000000000 +0200
+--- configure.orig     2009-06-10 20:50:53.000000000 +0000
 +++ configure
 @@ -1619,6 +1619,10 @@ case $target_os in
          add_cflags -D__EXTENSIONS__
@@ -39,3 +39,12 @@
  
  # ---
  # check availability of some header files
+@@ -2101,7 +2110,7 @@ enabled libschroedinger && add_cflags $(
+ enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex
+ enabled libtheora  && require  libtheora theora/theora.h theora_info_init -ltheora -logg
+ enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
+-enabled libx264    && require  libx264 x264.h x264_encoder_open -lx264 -lm &&
++enabled libx264    && require  libx264 x264.h x264_encoder_close -lx264 -lm &&
+                       { check_cpp_condition x264.h "X264_BUILD >= 65" ||
+                         die "ERROR: libx264 version must be >= 0.65."; }
+ enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore