[SCM] libav/master: configure: enable PIC on s390(x), Closes: #726733

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0fb3a15f44d3f7d13e9ba15ee8d6a5ca46a896e1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 5 02:49:38 2014 +0000

    configure: enable PIC on s390(x), Closes: #726733

diff --git a/debian/patches/s390x-pic.patch b/debian/patches/s390x-pic.patch
new file mode 100644
index 0000000..7119d60
--- /dev/null
+++ b/debian/patches/s390x-pic.patch
@@ -0,0 +1,36 @@
+From 798c715f4fa5cde37456af6202a32ee62cfb96d9 Mon Sep 17 00:00:00 2001
+From: Reinhard Tartler <siretart at tauware.de>
+Date: Sun, 2 Mar 2014 02:11:05 -0500
+Subject: [PATCH] configure: enable PIC on s390(x)
+Bug-Debian: http://bugs.debian.org/726733
+Origin: upstream
+
+The s390 architecture requires shared libraries to be built in PIC mode.
+Otherwise applications will get wrong relocations at run-time, leading
+to confusing segmentation faults.
+
+CC: libav-stable at libav.org
+(cherry picked from commit 5ddc9f5052316608799b932c604f9e7561f8ce24)
+(cherry picked from commit 7509c2c4ea2180733cc60ab1a0e0fe4ce2f02a69)
+---
+ configure |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index d2b4122..d65c112 100755
+--- a/configure
++++ b/configure
+@@ -2818,6 +2818,10 @@ case "$arch" in
+         check_64bit ppc ppc64 'sizeof(void *) > 4'
+         spic=$shared
+     ;;
++    s390)
++        check_64bit s390 s390x 'sizeof(void *) > 4'
++        spic=$shared
++    ;;
+     sparc)
+         check_64bit sparc sparc64 'sizeof(void *) > 4'
+         spic=$shared
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 4bce132..66cadf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 spelling-errors.patch
 freetype-api.patch
 support-opus-in-ogg.patch
+s390x-pic.patch

-- 
Libav/FFmpeg packaging