[pkgsrc/trunk]: pkgsrc/multimedia/mpeg4ip Fix build when faac is installed. R...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3e769a0c884
branches:  trunk
changeset: 511546:a3e769a0c884
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Apr 16 23:50:09 2006 +0000

description:
Fix build when faac is installed. Reported by veego@.

diffstat:

 multimedia/mpeg4ip/distinfo         |   4 ++--
 multimedia/mpeg4ip/patches/patch-aa |  11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r c4f32332f14c -r a3e769a0c884 multimedia/mpeg4ip/distinfo
--- a/multimedia/mpeg4ip/distinfo       Sun Apr 16 23:20:15 2006 +0000
+++ b/multimedia/mpeg4ip/distinfo       Sun Apr 16 23:50:09 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/12 21:39:38 wiz Exp $
+$NetBSD: distinfo,v 1.2 2006/04/16 23:50:09 wiz Exp $
 
 SHA1 (mpeg4ip-1.4.1.tar.gz) = f0a4b9ecfb281c6c20b332002a7e341e27a9ea10
 RMD160 (mpeg4ip-1.4.1.tar.gz) = 656d06433d490aadadd8c6fd8e8d5727870e8766
 Size (mpeg4ip-1.4.1.tar.gz) = 4791075 bytes
-SHA1 (patch-aa) = 871343e2f8412b8141849a74170c8336424c067d
+SHA1 (patch-aa) = c35f7bfd5f8fe229fd022def69a7030ffa837c07
 SHA1 (patch-ab) = 93875dfe86b50c399113915fbac523becae3e2aa
diff -r c4f32332f14c -r a3e769a0c884 multimedia/mpeg4ip/patches/patch-aa
--- a/multimedia/mpeg4ip/patches/patch-aa       Sun Apr 16 23:20:15 2006 +0000
+++ b/multimedia/mpeg4ip/patches/patch-aa       Sun Apr 16 23:50:09 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/04/12 21:39:38 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/16 23:50:09 wiz Exp $
 
 --- bootstrap.orig     2005-08-12 17:17:17.000000000 +0000
 +++ bootstrap
@@ -11,3 +11,12 @@
  if sdl-config --version >/dev/null 2>/dev/null
      then
      echo "SDL appears to be installed"
+@@ -56,7 +56,7 @@ if test $target_system = "Linux"; then
+ 
+     if test $have_faac = "yes"; then
+       # we have lame and faac - see if faac is built with mp4 support
+-      faac --help >&faac_help
++      faac --help >faac_help 2>&1
+       sdf=`grep "MP4 support unavailable" faac_help`
+       rm -f faac_help
+       if test -z "$sdf"; then