[SCM] ffmpeg/ubuntu.extra: Imported Debian patch 0.6-2ubuntu4

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 729a36a58da6ab50122d17483d053b803f89c8bc
Author: Matthias Klose <doko at ubuntu.com>
Date:   Mon Oct 4 19:39:46 2010 +0200

    Imported Debian patch 0.6-2ubuntu4

diff --git a/debian/changelog b/debian/changelog
index b530f4d..71807a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ffmpeg (4:0.6-2ubuntu4) maverick; urgency=low
+
+  * Configure with --enable-pic on powerpc. LP: #654666.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 04 Oct 2010 19:39:46 +0200
+
 ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low
 
   * add libxfixes-dev to build-depends, LP: #631103
diff --git a/debian/confflags b/debian/confflags
index 96c1871..e7be834 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -98,6 +98,9 @@ ifeq      ($(DEB_HOST_ARCH),armel)
 # plenty of incompatible assembly; not sure how to detect that properly
 confflags += --extra-cflags="-marm -fPIC -DPIC"
 endif
+ifeq      ($(DEB_HOST_ARCH),powerpc)
+confflags += --enable-pic
+endif
 confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse

-- 
FFmpeg packaging