[SCM] x264/master: Drop debian/patches/aarch64-pic.patch, merged upstream
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Jul 11 01:32:54 UTC 2014
The following commit has been merged in the master branch:
commit d014dedac3b391976893d7caa652f2163648ac63
Author: Reinhard Tartler <siretart at tauware.de>
Date: Thu Jul 10 21:24:36 2014 -0400
Drop debian/patches/aarch64-pic.patch, merged upstream
diff --git a/debian/patches/aarch64-pic.patch b/debian/patches/aarch64-pic.patch
deleted file mode 100644
index 3a0b672..0000000
--- a/debian/patches/aarch64-pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Build with -fPIC on aarch64 to fix link failure.
-Author: William Grant <wgrant at ubuntu.com>
-
---- a/configure
-+++ b/configure
-@@ -713,7 +713,7 @@ if [ $compiler != ICL ]; then
- fi
- fi
-
--if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" -o $ARCH = "ARM" -o $ARCH = "IA64" -o $ARCH = "PARISC" -o $ARCH = "MIPS" \) ] ; then
-+if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" -o $ARCH = "ARM" -o $ARCH = "IA64" -o $ARCH = "PARISC" -o $ARCH = "MIPS" -o $ARCH = "AARCH64" \) ] ; then
- pic="yes"
- fi
-
diff --git a/debian/patches/link_gpac_dynamically.patch b/debian/patches/link_gpac_dynamically.patch
index 0de5d7b..535dac1 100644
--- a/debian/patches/link_gpac_dynamically.patch
+++ b/debian/patches/link_gpac_dynamically.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -940,7 +940,7 @@ fi
+@@ -946,7 +946,7 @@ fi
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
diff --git a/debian/patches/series b/debian/patches/series
index 5cbc1d4..19096e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-aarch64-pic.patch
link_gpac_dynamically.patch
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list