From ee02fbdb07be5217869fbb50bbde8cef438b1784 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 29 Mar 2019 20:19:31 +0300
Subject: [PATCH] CDPlayer: fix build

---
 haiku-apps/cdplayer/cdplayer-1.0.recipe | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/haiku-apps/cdplayer/cdplayer-1.0.recipe b/haiku-apps/cdplayer/cdplayer-1.0.recipe
index 6a5e2f901..a07ff1410 100644
--- a/haiku-apps/cdplayer/cdplayer-1.0.recipe
+++ b/haiku-apps/cdplayer/cdplayer-1.0.recipe
@@ -1,9 +1,8 @@
 SUMMARY="A 'remote control' for the CD-ROM drive"
-DESCRIPTION="
-CDPlayer is like a remote control for the CD-ROM drive. It completely \
-by-passes Haiku's media services. If your CD-ROM drive doesn't support \
-that or its audio outputs aren't connected to speakers (or routed through \
-your soundcard), you won't hear a thing...
+DESCRIPTION="CDPlayer is like a remote control for the CD-ROM drive. \
+It completely by-passes Haiku's media services. If your CD-ROM drive \
+doesn't support that or its audio outputs aren't connected to speakers \
+(or routed through your soundcard), you won't hear a thing...
 Modern computers only rarely fulfill these requirements.
 
 In that case you're better off mounting the CD in Tracker and use \
@@ -14,26 +13,28 @@ COPYRIGHT="1992-2000 Be Incorporated
 LICENSE="Be Sample Code License
 	MIT"
 REVISION="1"
-SOURCE_URI="https://github.com/HaikuArchives/CDPlayer/archive/master.zip"
-CHECKSUM_SHA256="01ff0d0c94d36d005af20c9954f817f3a4aeacf69bf673dbc0ea92439cb11eb8"
+srcGitRev="f7e839c39669be0f5119941eda30231be522ad97"
+SOURCE_URI="https://github.com/HaikuArchives/CDPlayer/archive/$srcGitRev.zip"
+SOURCE_DIR="CDPlayer-$srcGitRev"
+CHECKSUM_SHA256="20a8b0ba025c407295af4f81e573d668c5023ebf5b4c796ccc7ee4d3b5342b64"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	CDPlayer$secondaryArchSuffix = $portVersion
-	app:CDPlayer$secondaryArchSuffix = $portVersion
+	CDPlayer = $portVersion
+	app:CDPlayer = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:g++$secondaryArchSuffix
+	cmd:g++
 	cmd:make
 	"