From e0e531a364a9beab8ee080679d8f95c13f8ad86e Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Wed, 9 Jul 2014 10:50:19 +0200
Subject: [PATCH 1/2] Added CDPlayer recipe.

---
 haiku-apps/cdplayer/cdplayer-1.0.recipe | 53 +++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 haiku-apps/cdplayer/cdplayer-1.0.recipe

diff --git a/haiku-apps/cdplayer/cdplayer-1.0.recipe b/haiku-apps/cdplayer/cdplayer-1.0.recipe
new file mode 100644
index 000000000..8281aed6e
--- /dev/null
+++ b/haiku-apps/cdplayer/cdplayer-1.0.recipe
@@ -0,0 +1,53 @@
+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...
+Modern computers only rarely fulfill these requirements.
+
+In that case you're better off mounting the CD in Tracker and use \
+MediaPlayer to play back the audio files in its wav folder.
+"
+HOMEPAGE="https://github.com/HaikuArchives/CDPlayer"
+SRC_URI="git://github.com/HaikuArchives/CDPlayer#015f84c84f495fd6d635b8646be54eb2f13579c5"
+LICENSE="Be Sample Code License
+	MIT"
+COPYRIGHT="1992-2000, Be Incorporated
+	2006-2009 by Haiku Inc.
+	"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+PROVIDES="
+	CDPlayer = $portVersion
+	app:CDPlayer = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	ARCH=$(echo $buildArchitecture | sed 's/_/-/g')	
+	cp -af src/objects.$ARCH-release/CDPlayer $appsDir
+	addAppDeskbarSymlink $appsDir/CDPlayer
+}

From c3eef8b351a16395fb9dac8dcfc715d5d554daf6 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 10 Jul 2014 17:36:12 +0200
Subject: [PATCH 2/2] Added $secondaryArchSuffix, using g++, updated to newest
 cdplayer commit, use OBJ_DIR parameter of make. Thanks waddlesplash for the
 hints.

---
 haiku-apps/cdplayer/cdplayer-1.0.recipe | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/haiku-apps/cdplayer/cdplayer-1.0.recipe b/haiku-apps/cdplayer/cdplayer-1.0.recipe
index 8281aed6e..a71583d8b 100644
--- a/haiku-apps/cdplayer/cdplayer-1.0.recipe
+++ b/haiku-apps/cdplayer/cdplayer-1.0.recipe
@@ -10,7 +10,7 @@ In that case you're better off mounting the CD in Tracker and use \
 MediaPlayer to play back the audio files in its wav folder.
 "
 HOMEPAGE="https://github.com/HaikuArchives/CDPlayer"
-SRC_URI="git://github.com/HaikuArchives/CDPlayer#015f84c84f495fd6d635b8646be54eb2f13579c5"
+SRC_URI="git://github.com/HaikuArchives/CDPlayer#f7e839c39669be0f5119941eda30231be522ad97"
 LICENSE="Be Sample Code License
 	MIT"
 COPYRIGHT="1992-2000, Be Incorporated
@@ -18,22 +18,24 @@ COPYRIGHT="1992-2000, Be Incorporated
 	"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
-	CDPlayer = $portVersion
-	app:CDPlayer = $portVersion
+	CDPlayer$secondaryArchSuffix = $portVersion
+	app:CDPlayer$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gcc
+	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:mkdepend
 	"
@@ -41,13 +43,12 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	cd src
-	make $jobArgs
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir
-	ARCH=$(echo $buildArchitecture | sed 's/_/-/g')	
-	cp -af src/objects.$ARCH-release/CDPlayer $appsDir
+	cp -af src/objects/CDPlayer $appsDir
 	addAppDeskbarSymlink $appsDir/CDPlayer
 }