From dcac1f2ff9ee6f0e6ddb53a6f53efeaf570046b3 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 9 Feb 2019 12:42:01 +0100
Subject: [PATCH] APlayer: fix gcc2 build (#3624)

---
 haiku-apps/aplayer/aplayer-4.0_svn.recipe | 30 ++++++++++-------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
index b5907ea47..51594a0ba 100644
--- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe
+++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
@@ -3,15 +3,16 @@ DESCRIPTION="APlayer is a module player and can play a lot of different \
 music file formats, from Amiga and elsewhere."
 HOMEPAGE="https://github.com/pulkomandy/APlayer"
 COPYRIGHT="1994-2002 Polycode
-	2011-2016 Adrien Destugues"
+	2011-2017 Adrien Destugues"
 LICENSE="Artistic"
-REVISION="3"
-SOURCE_URI="https://github.com/pulkomandy/APlayer/archive/8fdb80db65d3480a0a6b84aa3d27def0da90ac95.tar.gz"
-CHECKSUM_SHA256="e16db6268c363644f2eacd37f1ef5279b296c63e776bab921a818b524fced71f"
-SOURCE_DIR="APlayer-8fdb80db65d3480a0a6b84aa3d27def0da90ac95"
+REVISION="4"
+srcGitRev="6a9ce3d3950d929d3a071431ca08c38cc84b1587"
+SOURCE_URI="https://github.com/pulkomandy/APlayer/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="e0ec74ca68da5e1931dc29a75bbcf8cdfc60fdd2e1977b79ecef9ff842db212d"
+SOURCE_DIR="APlayer-$srcGitRev"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 !x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
 
 PROVIDES="
 	aplayer$secondaryArchSuffix = $portVersion
@@ -27,8 +28,10 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgme$secondaryArchSuffix
+	devel:libsanta$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -37,21 +40,14 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cd Master
 	make
-	cd ..
 }
 
 INSTALL()
 {
-	aplayerDir=$appsDir/APlayer
-	mkdir -p $aplayerDir $aplayerDir/add-ons $aplayerDir/Documentation $aplayerDir/lib
+	mkdir -p $appsDir/APlayer
 
-	cp APlayer/bin/BeOS_$targetArchitecture/APlayer $aplayerDir
-	cp -r Documentation/* $aplayerDir/Documentation
-	cp -r APlayer/bin/BeOS_$targetArchitecture/add-ons/* $aplayerDir/add-ons
-	cp APlayer/bin/BeOS_$targetArchitecture/lib/APlayerKit.so $aplayerDir/lib
-	cp PolyKit/bin/BeOS/$targetArchitecture/PolyKit.so $aplayerDir/lib
+	cp -r dist/* $appsDir/APlayer
 
-	addAppDeskbarSymlink $aplayerDir/APlayer
+	addAppDeskbarSymlink $appsDir/APlayer/APlayer
 }