[pkgsrc/trunk]: pkgsrc/multimedia/mpeg4ip make this build even if audio/faac ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59e223209ca6
branches:  trunk
changeset: 397388:59e223209ca6
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Aug 11 13:11:23 2009 +0000

description:
make this build even if audio/faac is installed

diffstat:

 multimedia/mpeg4ip/distinfo         |   4 ++--
 multimedia/mpeg4ip/patches/patch-aa |  16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 146f1d33ce88 -r 59e223209ca6 multimedia/mpeg4ip/distinfo
--- a/multimedia/mpeg4ip/distinfo       Tue Aug 11 13:10:46 2009 +0000
+++ b/multimedia/mpeg4ip/distinfo       Tue Aug 11 13:11:23 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2008/11/21 21:09:57 chuck Exp $
+$NetBSD: distinfo,v 1.12 2009/08/11 13:11:23 drochner Exp $
 
 SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3
 RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a
 Size (mpeg4ip-1.5.0.1.tar.gz) = 4826180 bytes
-SHA1 (patch-aa) = c35f7bfd5f8fe229fd022def69a7030ffa837c07
+SHA1 (patch-aa) = 5f494117fae307f4adc503fd880a762d82d771ff
 SHA1 (patch-ab) = 93875dfe86b50c399113915fbac523becae3e2aa
 SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9
 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56
diff -r 146f1d33ce88 -r 59e223209ca6 multimedia/mpeg4ip/patches/patch-aa
--- a/multimedia/mpeg4ip/patches/patch-aa       Tue Aug 11 13:10:46 2009 +0000
+++ b/multimedia/mpeg4ip/patches/patch-aa       Tue Aug 11 13:11:23 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2006/04/16 23:50:09 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/08/11 13:11:23 drochner Exp $
 
---- bootstrap.orig     2005-08-12 17:17:17.000000000 +0000
+--- bootstrap.orig     2005-08-12 19:17:17.000000000 +0200
 +++ bootstrap
 @@ -34,7 +34,7 @@ if (test ! -f "$MPEG4IP_SRC/configure") 
      exit 1
@@ -11,7 +11,17 @@
  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
+@@ -48,7 +48,8 @@ allargs="$@"
+ #
+ # Test for faac and possible error
+ #
+-if test $target_system = "Linux"; then
++#if test $target_system = "Linux"; then
++if false; then
+     have_faac=no
+     if which faac >/dev/null 2>/dev/null; then
+       have_faac=yes
+@@ -56,7 +57,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