diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/mplayer/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/mplayer/mplayer-glibc-2.27.patch | 21 |
2 files changed, 32 insertions, 2 deletions
diff --git a/libre/mplayer/PKGBUILD b/libre/mplayer/PKGBUILD index 7a49f1256..a362f5ac7 100644 --- a/libre/mplayer/PKGBUILD +++ b/libre/mplayer/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=mplayer pkgname=('mplayer' 'mencoder') pkgver=38101 -pkgrel=1.parabola1 +pkgrel=1.parabola2 pkgdesc='Media player for GNU/Linux, without nonfree UnRAR and FAAC' url='http://www.mplayerhq.hu/' arch=('x86_64' 'i686' 'armv7h') @@ -26,15 +26,22 @@ source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${p mplayer.desktop include-samba-4.0.patch revert-icl-fixes.patch) +source_i686=(mplayer-glibc-2.27.patch) sha512sums=('SKIP' 'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc' '9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99' '0cae0b26d3d97fd4c962962c43a481de20335369cbca406cadfc9bda1a0608b32f5374e76c477cb9a85bda83a568a1ed17126df224ae61579d0a402c1824aea8') +sha512sums_i686=('e333820880de1a276a3f693fe257bd9468720d193975483537ff09af0a44e0283a233392e92284c4dc3af4897e69f20dbec715b54545810e30743c1d6537fb51') prepare() { cd ${pkgbase}-${pkgver} patch -p1 < "../include-samba-4.0.patch" patch -p0 < "../revert-icl-fixes.patch" + + if [ "$CARCH" = "i686" ]; then + patch -p1 < "../mplayer-glibc-2.27.patch" + fi + ./version.sh } @@ -44,7 +51,9 @@ build() { # CPU detection doesn't work in ARM if [ "$CARCH" != "armv7h" ]; then extra=--enable-runtime-cpudetection - elif [ "$CARCH" != "x86_64" ]; then + fi + + if [ "$CARCH" = "x86_64" ]; then export CFLAGS="${CFLAGS/-march=x86-64/}" export CFLAGS="${CFLAGS/-mtune=generic/}" fi diff --git a/libre/mplayer/mplayer-glibc-2.27.patch b/libre/mplayer/mplayer-glibc-2.27.patch new file mode 100644 index 000000000..68f1c892a --- /dev/null +++ b/libre/mplayer/mplayer-glibc-2.27.patch @@ -0,0 +1,21 @@ +Description: Fix FTBFS with glibc 2.27 on i386 + cpudetect.c uses the non-standard "struct sigcontext" in its SIGILL handler. As + of glibc 2.27, this is not defined in strict standards compliant mode. + . + Fix by defining _GNU_SOURCE in cpudetect.c. +Author: James Cowgill <jcowgill@debian.org> +Bug: https://trac.mplayerhq.hu/ticket/2343 +Bug-Debian: https://bugs.debian.org/896805 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/cpudetect.c ++++ b/cpudetect.c +@@ -16,6 +16,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#define _GNU_SOURCE ++ + #include "mpx86asm.h" + #include "config.h" + #include "cpudetect.h" |