[proaudio] [1196] * Disabled CFLAGS patch for ardour-2.4.1

[subversion@xxxxxxxxxxxxx]

Revision: 1196
Author:   marcochapeau
Date:     2008-04-10 20:08:48 +0200 (Thu, 10 Apr 2008)

Log Message:
-----------
* Disabled CFLAGS patch for ardour-2.4.1

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ardour/ChangeLog
    trunk/overlays/proaudio/media-sound/ardour/Manifest
    trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4.1-find_soundtouch.patch


Modified: trunk/overlays/proaudio/media-sound/ardour/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ChangeLog	2008-04-10 14:30:04 UTC (rev 1195)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog	2008-04-10 18:08:48 UTC (rev 1196)
@@ -3,7 +3,8 @@
 # $Header: $
 
   10 Apr 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx>; ardour-2.4.1.ebuild:
-  Version bump
+  * Version bump
+  * Disabled the CFLAGS patch until it's fixed
 
   04 Apr 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>; ardour-2.4.ebuild:
   added custom cflags patch again + USE freesound

Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-04-10 14:30:04 UTC (rev 1195)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-04-10 18:08:48 UTC (rev 1196)
@@ -2,6 +2,7 @@
 AUX ardour-2.0.3-sndfile-external.patch 1409 RMD160 cbc6381f17a7978caa56aff0d5e0ce8b64f7161d SHA1 6559d30abdc3a89121097ed2649872806ce4a736 SHA256 71542baed4deeae9505107973361a5aab06f49ceaeb3bf7d2e7c5ffd73cc604d
 AUX ardour-2.3.1-find_soundtouch.patch 854 RMD160 0d5eb1c4b508ecf4065abff6ae478d1c205e6e0c SHA1 335b1f2e847de16f443773a024494851d0514073 SHA256 6996c289b5711a5552c2d2dc841226b1b749a2a51a6044e32264a7007de5384d
 AUX ardour-2.4-find_soundtouch.patch 854 RMD160 0d5eb1c4b508ecf4065abff6ae478d1c205e6e0c SHA1 335b1f2e847de16f443773a024494851d0514073 SHA256 6996c289b5711a5552c2d2dc841226b1b749a2a51a6044e32264a7007de5384d
+AUX ardour-2.4.1-find_soundtouch.patch 854 RMD160 0d5eb1c4b508ecf4065abff6ae478d1c205e6e0c SHA1 335b1f2e847de16f443773a024494851d0514073 SHA256 6996c289b5711a5552c2d2dc841226b1b749a2a51a6044e32264a7007de5384d
 DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
 DIST ardour-2.1.tar.bz2 2788128 RMD160 70796eb07911c5301049fb2d2749cbaa7a04ba4d SHA1 fcfb1230b9e7ec42c0044be89a6e25aa31a75658 SHA256 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
 DIST ardour-2.2.tar.bz2 4296980 RMD160 ec1e00a546b51e3f8fd8afb0b6d661df66862cd1 SHA1 195ba17570102dcb7fb09d40457b4afefbd3e16a SHA256 fc0d405e1e1d31b3e353095db67b7dc874c201ff43954751b72f57ae836799ee
@@ -12,9 +13,9 @@
 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.1.ebuild 4453 RMD160 dc5fdf49c476d32113860118c5fcb7b4fae1f1ee SHA1 c8484b8f857453afe657d9f0de58d8a7a6a6ff9a SHA256 a209caa3d6bf0ffe53d8f7c8e18e58273cc2d60751ac6f55124a78024a665c96
+EBUILD ardour-2.4.1.ebuild 4398 RMD160 899274601c5f7a9fa7063ae82cc8988c145981e7 SHA1 08c7b0ea5591d0c309c943855dd0ea5b77bdeee9 SHA256 c4b371f02b84e03352ac4b28ebacd192115fe0445c12e6dba2bf461294c25a7f
 EBUILD ardour-2.4.ebuild 4453 RMD160 dc5fdf49c476d32113860118c5fcb7b4fae1f1ee SHA1 c8484b8f857453afe657d9f0de58d8a7a6a6ff9a SHA256 a209caa3d6bf0ffe53d8f7c8e18e58273cc2d60751ac6f55124a78024a665c96
 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 1623 RMD160 fa9d718489055063c7ccd79d23fec28e83963ba6 SHA1 473b09742acfab2fae942670447c85cde5d771c5 SHA256 443cc2075ed5912c2e0f4a29bf8cb9bcf67925bb4513a1dc684a0b1b803556d0
+MISC ChangeLog 1672 RMD160 3452a97b2a8c52abef79d74b93cfd0e4e52c5b2f SHA1 114d4468e3f9cda50b39b460bd5ed7b0ef4898ac SHA256 b8b93ef20118a7b7fcdd0ff4f19cd687c384dfc4c45adc8144f65bee82eda8cd
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild	2008-04-10 14:30:04 UTC (rev 1195)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild	2008-04-10 18:08:48 UTC (rev 1196)
@@ -12,7 +12,6 @@
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="altivec debug nls sse sys-libs vst lv2 freesound"
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
 
 RDEPEND="media-libs/liblo
 	>=media-libs/liblrdf-0.4.0
@@ -82,7 +81,7 @@
 	unpack ${A}
 	cd "${S}"
 
-	patcher "${FILESDIR}/${PN}-2.0.3-cflags.patch" -a -f
+	# patcher "${FILESDIR}/${PN}-2.0.3-cflags.patch" -a -f
 
 	# SYSLIBS also use external sndfile
 	use sys-libs && epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"

Copied: trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4.1-find_soundtouch.patch (from rev 1194, trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-find_soundtouch.patch)
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4.1-find_soundtouch.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4.1-find_soundtouch.patch	2008-04-10 18:08:48 UTC (rev 1196)
@@ -0,0 +1,14 @@
+--- SConstruct.orig	2008-02-07 16:44:02.000000000 +0100
++++ SConstruct	2008-02-07 16:44:28.000000000 +0100
+@@ -1006,9 +1006,9 @@
+ 
+ #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+     libraries['soundtouch'] = LibraryInfo()
+-    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
++    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+     # Comment the previous line and uncomment this for Debian:
+-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
++    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+ 
+     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+                                             LIBPATH='#libs/appleutility',