[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-3-6-ga3662f6

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Jan 15 20:35:12 UTC 2010


The following commit has been merged in the master branch:
commit a3662f6806d2020491cda2587a806074997f9947
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 15 21:31:22 2010 +0100

    build with PIC on powerpc (Closes: #561956)
    
    remove now unnecessary extra -DPIC flags in debian/confflags, the patch
    is taking care of that now.

diff --git a/debian/confflags b/debian/confflags
index aa813fd..f538514 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -165,7 +165,6 @@ altivec_build_confflags += --shlibdir=/usr/lib/altivec
 altivec_build_confflags += --cpu='g4'
 altivec_build_confflags += --enable-shared
 altivec_build_confflags += --disable-static
-altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
 altivec_build_confflags += --enable-altivec
 altivec_build_confflags += --disable-ffmpeg
 altivec_build_confflags += --disable-ffplay
diff --git a/debian/patches/build-pic-on-ppc.patch b/debian/patches/build-pic-on-ppc.patch
new file mode 100644
index 0000000..1fa3964
--- /dev/null
+++ b/debian/patches/build-pic-on-ppc.patch
@@ -0,0 +1,17 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Bug: 561956
+Description: Build with pic on G3 macs
+
+diff --git a/configure b/configure
+index fd11501..d0cadb7 100755
+--- a/configure
++++ b/configure
+@@ -2205,7 +2205,7 @@ if enabled shared; then
+     # LIBOBJFLAGS may have already been set in the OS configuration
+     if test -z "$LIBOBJFLAGS" ; then
+         case "${subarch-$arch}" in
+-            x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;;
++            x86_64|ia64|alpha|sparc*|ppc|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;;
+         esac
+     fi
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 90c1aec..07d5de3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ fix-dv-seeking.patch
 fix-constant-quant-encoding.patch
 increase-VOFW-on-x86.patch
 issue1245.patch
+build-pic-on-ppc.patch
 enable-versioning.patch
 use-normal-check_func-test-for-math-functions.patch
 900_doxyfile

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list