[proaudio] [1192] added custom cflags patch again + USE freesound

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 1192
Author:   evermind
Date:     2008-04-04 16:01:47 +0200 (Fri, 04 Apr 2008)

Log Message:
-----------
added custom cflags patch again + USE freesound

Modified Paths:
--------------
    trunk/overlays/proaudio/eclass/patcher.eclass
    trunk/overlays/proaudio/media-sound/ardour/ChangeLog
    trunk/overlays/proaudio/media-sound/ardour/Manifest
    trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.ebuild
    trunk/overlays/proaudio/profiles/use.desc
    trunk/overlays/proaudio/profiles/use.local.desc


Modified: trunk/overlays/proaudio/eclass/patcher.eclass
===================================================================
--- trunk/overlays/proaudio/eclass/patcher.eclass	2008-04-04 09:26:37 UTC (rev 1191)
+++ trunk/overlays/proaudio/eclass/patcher.eclass	2008-04-04 14:01:47 UTC (rev 1192)
@@ -7,6 +7,11 @@
 # Purpose: 
 #
 
+# TODO
+#	* redo the options parsing as it is really ugly by now
+#	* include option to abort if patch fails
+#	* analyze complete arguments
+
 # patch files but don't interrupt if it fails
 # (just give a message)
 # only one function to use here:
@@ -124,6 +129,9 @@
 		else
 			[ "${gVERBOSE}" == "1" ] && fnc_display_failed_patches "${lFAILED_PATCH_LOG}" "${lPATCHED}"
 			eerror " [NOT applied] ${lPATCHFILE##*/}"
+			if [ "$gDie" ];then
+				die "patching failed ${lPATCHFILE##*/}"
+			fi
 		fi
 		fnc_remove_tmp_file "${lDECOMPRESS_PATCH}"
 		fnc_remove_tmp_file "${lFAILED_PATCH_LOG}"
@@ -201,6 +209,14 @@
 	-o "x${lCMDLINE[1]}" == "x-R" -o "x${lCMDLINE[1]}" == "x-r" ] && gREVERSE=1 || gREVERSE=0
 	[ "x${lCMDLINE[1]}" == "xapply" -o "x${lCMDLINE[2]}" == "xapply" \
 	-o "x${lCMDLINE[1]}" == "x-a" -o "x${lCMDLINE[1]}" == "x-a" ] &&  gDontReverse=1 || gDontReverse=0
+	if [ "x${lCMDLINE[1]}" == "xapply_die" -o "x${lCMDLINE[2]}" == "xapply_die" \
+	-o "x${lCMDLINE[1]}" == "x-a" -o "x${lCMDLINE[1]}" == "x-a" ] ;then
+		gDontReverse=1 
+		gDie=1 
+	else
+		gDie=0 
+		gDontReverse=0
+	fi
 	[ "x${lCMDLINE[0]##*/}" == "xpatch-list" -o "x${lCMDLINE[0]##*.}" == "xlst" ] && gLIST_GIVEN=1 || gLIST_GIVEN=0
 	[ "x${lCMDLINE[1]}" == "xverbose" -o  "x${lCMDLINE[2]}" == "xverbose" \
 	-o "x${lCMDLINE[1]}" == "x-v" -o  "x${lCMDLINE[2]}" == "x-v" ] && gVERBOSE=1 || gVERBOSE=0

Modified: trunk/overlays/proaudio/media-sound/ardour/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ChangeLog	2008-04-04 09:26:37 UTC (rev 1191)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog	2008-04-04 14:01:47 UTC (rev 1192)
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Apr 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>; ardour-2.4.ebuild:
+  added custom cflags patch again + USE freesound
+
   04 Apr 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
   ardour-2.3.1.ebuild, +ardour-2.4.ebuild,
   +files/ardour-2.4-find_soundtouch.patch:

Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-04-04 09:26:37 UTC (rev 1191)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-04-04 14:01:47 UTC (rev 1192)
@@ -11,8 +11,8 @@
 EBUILD ardour-2.1.ebuild 4205 RMD160 c1009642cb3ab16b14663fd9903b7f2be417445d SHA1 d51e9d56bd8dfba515ab83bf186225473ba031cc SHA256 8022e867006cf705163b6928c705a010e3dbb75f50f73f271a1191dc34aeca6a
 EBUILD ardour-2.2.ebuild 4205 RMD160 74950f3ef10f5330949d7ccb0d13ed287db965aa SHA1 d0fd6eb6b4e4587f11bece468895922e8f270de8 SHA256 906c66c2efb70f1163c84170d530ef8091f8b4cba97a83cf28b32b82243c1aa7
 EBUILD ardour-2.3.1.ebuild 4335 RMD160 d014b0d33d4f91171f9d1fdf0a5edef21203f346 SHA1 a6cc6129a0dd006fcd0bd90d4afc4f7c54494056 SHA256 bdba75247f86b18dc64347c5fbc2ccf8894dee39fc559f289e60ede67dc3530b
-EBUILD ardour-2.4.ebuild 4335 RMD160 d014b0d33d4f91171f9d1fdf0a5edef21203f346 SHA1 a6cc6129a0dd006fcd0bd90d4afc4f7c54494056 SHA256 bdba75247f86b18dc64347c5fbc2ccf8894dee39fc559f289e60ede67dc3530b
+EBUILD ardour-2.4.ebuild 4457 RMD160 214adcde94157fa7dd69ceec8881343cba4b0cc1 SHA1 dadbbcb76b24177168e0673c7bf267c91b27048d SHA256 b862bea50380c46abc7c2b19a9f5dae6b035335381bc2d3d0d5dbe051dde4d30
 EBUILD ardour-2.9999.ebuild 3655 RMD160 e196a6e98bebe8d3631b817293e9facbe8e90e8e SHA1 99efefa79210d78500a9f617d3f40a83ac9bbbf0 SHA256 9ff4fb649a1576278b8b89f125a0c3a2270c63b3b0c028293f0d6f86ef645262
 EBUILD ardour-99992.ebuild 3357 RMD160 8f20b5e6598f87d1fca4573b7cf1d12ec48defbb SHA1 b1d3f58ed9a2da4db5f7c5e9641e8bc3222f3757 SHA256 4d1e7740509fd04d9e7aa06c6263fe0c81ee28d1d05816505ee780f28ea57299
-MISC ChangeLog 1398 RMD160 3a31eb63d605e472280e2e4c9dd0b277b46687f2 SHA1 4be8ffbe2b1da0843b9f9e1fec4371d3a643e903 SHA256 0ebf3152b759aa221532fdcadc3f9019f0bf10139b62c2377e882e76edcbe8bf
+MISC ChangeLog 1526 RMD160 e0b8a3865de0c996923b4ec5bc5829cd220535d0 SHA1 04c4b8899cd6c8116c7e9f9302e59bc89f68ea68 SHA256 3fb410cf7c0fe0b15c3b80db6eb2b9571c8e0d26bd1a3155bd8b2e5766ce8cb9
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.ebuild	2008-04-04 09:26:37 UTC (rev 1191)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.ebuild	2008-04-04 14:01:47 UTC (rev 1192)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils toolchain-funcs flag-o-matic scons-ccache vst versionator
+inherit eutils toolchain-funcs flag-o-matic scons-ccache vst versionator patcher
 
 DESCRIPTION="multi-track hard disk recording software"
 HOMEPAGE="http://ardour.org/";
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec debug nls sse sys-libs vst lv2"
+IUSE="altivec debug nls sse sys-libs vst lv2 freesound"
 S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
 
 RDEPEND="media-libs/liblo
@@ -82,8 +82,11 @@
 	unpack ${A}
 	cd "${S}"
 
+	patcher "${FILESDIR}/${PN}-2.0.3-cflags.patch" apply_die
+
 	# SYSLIBS also use external sndfile
-	#use sys-libs && epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
+	use sys-libs && epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
+
 	epatch "${FILESDIR}/${P}-find_soundtouch.patch"
 
 	ardour_vst_prepare
@@ -116,6 +119,7 @@
 		$(ardour_use_enable VST vst) \
 		$(ardour_use_enable SYSLIBS sys-libs) \
 		$(ardour_use_enable LV2 lv2) \
+		$(ardour_use_enable FREESOUND freesound) \
 		DESTDIR="${D}" \
 		CFLAGS="${CFLAGS}" \
 		PREFIX=/usr \

Modified: trunk/overlays/proaudio/profiles/use.desc
===================================================================
--- trunk/overlays/proaudio/profiles/use.desc	2008-04-04 09:26:37 UTC (rev 1191)
+++ trunk/overlays/proaudio/profiles/use.desc	2008-04-04 14:01:47 UTC (rev 1192)
@@ -3,3 +3,4 @@
 dssi - Enable the DSSI midi synthesizer provider
 jackmidi - Enable for the JACK-MIDI API from jack-audio-connection-kit
 postgresql - Adds support for the PostgreSQL database server
+freesound - Add support direct searching and download of samples from Freesound

Modified: trunk/overlays/proaudio/profiles/use.local.desc
===================================================================
--- trunk/overlays/proaudio/profiles/use.local.desc	2008-04-04 09:26:37 UTC (rev 1191)
+++ trunk/overlays/proaudio/profiles/use.local.desc	2008-04-04 14:01:47 UTC (rev 1192)
@@ -13,3 +13,4 @@
 x11-themes/crystal-audio:laptop - Add recipes for laptop (can hang a rt kernel)
 media-libs/librdf:postgresql - Enable use of the Redland PostgreSQL triple store backend
 media-sound/ardour:sys-libs - use system libs instead of provided. No upstream support!!!
+media-sound/ardour:freesound - directly import samples from freesound via the import dialog


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/