From 92868b9657067817d289c58a7ae7a9cb5069046c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 3 Nov 2016 11:45:05 +0000
Subject: community/mplayer: fix build with gcc6 no-pie

---
 community/mplayer/APKBUILD | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'community/mplayer/APKBUILD')

diff --git a/community/mplayer/APKBUILD b/community/mplayer/APKBUILD
index e831880dab..e30a6408ec 100644
--- a/community/mplayer/APKBUILD
+++ b/community/mplayer/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mplayer
 pkgver=1.3.0
 _ver=${pkgver/_/}
-pkgrel=2
+pkgrel=3
 pkgdesc="A movie player for linux"
 url="http://www.mplayerhq.hu/"
 arch="x86_64"
@@ -17,20 +17,10 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
 source="ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz
 	x11-libs.patch
 	"
-_builddir="$srcdir"/MPlayer-$_ver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
-		esac;
-	done
-}
-
+builddir="$srcdir"/MPlayer-$_ver
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 
-	export GCC_SPECS=hardenednopie.specs
 	./configure \
 		--prefix=/usr \
 		--disable-gui \
@@ -56,7 +46,7 @@ build() {
 		--enable-radio \
 		--enable-radio-capture \
 		--extra-cflags="-I/usr/lib/live-media -O2 -fno-PIC -fno-PIE" \
-		--extra-ldflags="-nopie" \
+		--extra-ldflags="-no-pie" \
 		--disable-nemesi \
 		--enable-freetype \
 		--enable-xvmc \
@@ -65,7 +55,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -Dm644 etc/codecs.conf etc/input.conf etc/example.conf \
 		"$pkgdir"/etc/mplayer/ || return 1
-- 
cgit v1.2.3