Unbreak ffmpeg on NetBSD/macppc... again -- and a big fat comment warning

about this next to the relevant piece of code.  Looking at the CVS logs,
it's the 3rd time I fix this.  This, in turn, fixes the build of libdlna.

To fix the package, use the "proper" syntax to enable PIC within the
configure script, instead of applying what seems to be a hack. As before,
i386 is left PIC-less or otherwise ffmpeg breaks.

Tested on macppc and amd64.

3 files changed, 16 insertions, 14 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index a27b1d2dfa8..939fecdc97f 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2011/11/28 11:00:28 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2011/11/29 17:58:17 jmmv Exp $
 
 # XXX This is release 0.7.8 but we had date-based pkgnames before.
 PKGNAME=	ffmpeg-20111121.${DISTVERSION}
+PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 12c31706aef..63ecffb8505 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2011/11/28 11:00:28 drochner Exp $
+$NetBSD: distinfo,v 1.50 2011/11/29 17:58:17 jmmv Exp $
 
 SHA1 (ffmpeg-0.7.8.tar.bz2) = df4983c028a61d4bf3baceab3bae535b91b8928a
 RMD160 (ffmpeg-0.7.8.tar.bz2) = 8f69a6bc5caaba4e3d440c2d5dc96a946454a52c
@@ -7,4 +7,4 @@ SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
 SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb
 SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
 SHA1 (patch-ap) = 85b5f775c1b66b682585bd56a304dee19e45765f
-SHA1 (patch-configure) = 355743ab745fb4c47ff6c5ca403573660ec7ecb6
+SHA1 (patch-configure) = 242f16e06a30b8e55193ee647ab78e9fb2645231
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index f850c841e99..a85b0bfdc24 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -1,19 +1,20 @@
-$NetBSD: patch-configure,v 1.14 2011/11/07 10:43:35 drochner Exp $
+$NetBSD: patch-configure,v 1.15 2011/11/29 17:58:17 jmmv Exp $
 
---- configure.orig	2011-11-04 21:30:00.000000000 +0000
+--- configure.orig	2011-11-21 19:49:30.000000000 +0000
 +++ configure
-@@ -2412,6 +2412,10 @@ case $target_os in
+@@ -2412,6 +2412,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
-+	if test "${subarch}" != "x86_32"; then
-+	    LIBOBJFLAGS='$(PIC)'
-+	    SHFLAGS='-shared'
-+	fi
++        # NetBSD/macppc *really* needs PIC enabled.  ffmpeg has repeatedly
++        # broken time and time again because PIC support has been removed
++        # from architectures that need it.  So, if you touch this, please
++        # be careful and make sure that your changes work.
++        test "${subarch}" != "x86_32" && enable pic
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          ;;
-@@ -2637,10 +2641,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -2637,10 +2642,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -30,7 +31,7 @@ $NetBSD: patch-configure,v 1.14 2011/11/07 10:43:35 drochner Exp $
  
  if enabled alpha; then
  
-@@ -2974,7 +2981,7 @@ else
+@@ -2974,7 +2982,7 @@ else
  fi
  enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
@@ -39,7 +40,7 @@ $NetBSD: patch-configure,v 1.14 2011/11/07 10:43:35 drochner Exp $
  
  check_header linux/fb.h
  check_header linux/videodev.h
-@@ -3060,6 +3067,7 @@ check_ldflags -Wl,--warn-common
+@@ -3060,6 +3068,7 @@ check_ldflags -Wl,--warn-common
  check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
@@ -47,7 +48,7 @@ $NetBSD: patch-configure,v 1.14 2011/11/07 10:43:35 drochner Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -3072,6 +3080,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -3072,6 +3081,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi