[proaudio] [2646] media-libs/libffado: Update patches to not call jackd later on in the build.

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


Revision: 2646
Author:   lilrc
Date:     2013-04-02 17:57:04 +0200 (Tue, 02 Apr 2013)
Log Message:
-----------
media-libs/libffado: Update patches to not call jackd later on in the build. Thanks to Sebastian Rose for reporting the issue.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libffado/ChangeLog
    trunk/overlays/proaudio/media-libs/libffado/Manifest
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch

Modified: trunk/overlays/proaudio/media-libs/libffado/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/ChangeLog	2013-04-02 15:22:18 UTC (rev 2645)
+++ trunk/overlays/proaudio/media-libs/libffado/ChangeLog	2013-04-02 15:57:04 UTC (rev 2646)
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  files/libffado-2.1.0-no-jackd-version.patch,
+  files/libffado-9999-no-jackd-version.patch:
+  Update patches so that jackd --version wont be called later on in the build
+  process. (and fix typo)
+  Many thanks to Sebastian Rose for reporting the issue.
+
 *libffado-9999-r1 (01 Apr 2013)
 *libffado-2.1.0-r1 (01 Apr 2013)
 

Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest	2013-04-02 15:22:18 UTC (rev 2645)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest	2013-04-02 15:57:04 UTC (rev 2646)
@@ -1,7 +1,7 @@
-AUX libffado-2.1.0-no-jackd-version.patch 2398 SHA256 c873d4f8028698b363a2ced5b688f8f5cc3069c92b7f1c926ddd3cd659d2df00 SHA512 c54cd815dea8cc1de738e6c65a8d85256e261aaf86d5f23c0392567dfa18174570232a1be9492ef4daf5b68fdee8ec0fbfdcfa86e04c818484c66da0f6e54a60 WHIRLPOOL 6922af7c106a869033f40c00ae00df6c42a17cf64f789ee62d3736001b065150c6580ad400743dc93bc434067de50e87438d9952c51005427327ed947184cfd6
+AUX libffado-2.1.0-no-jackd-version.patch 3334 SHA256 818eaeb938932960e716834623a349b2eeccc6b0ce397ab45068a50928ae5e5a SHA512 390de7cedd6e5c7854bcd30f70e4cf508688092688ae9283af016a9c2dbf363f96038886cfa9085693259df02b421e1d0dd066461020571cccd2bd3fdeae5c42 WHIRLPOOL 9c711f173df5a0ddd90a527ed3fa2c0e1dc695dfe990e8bd9becc83ef00717a19e9274076586eb838ba8bafbe4680ae5db8b2344cb5b13f7383dc90800923f03
 AUX libffado-2.1.0/0001-honour-toolchain-env.patch 1306 SHA256 a9a83c2b15fe35eaa018fe58c240f8a8fa6644241163ee9455b9c2d772f93c11 SHA512 a96d8fbd54dac1a9ac2bb1ca16714c612267b431ea59d91e483f3b6df2ff42b174a22bc0aace54efd83ccb5eb07ed7632e6d49220f9beb0da266387f2181b6c3 WHIRLPOOL c443d68afe36e144bd577ef7a0d328c01dbf2cdf9de8b2e3a4311edcf6d293fc8c099de16033d15bf231b04b6409df2588e6bf6b33f7d1a9744366488d4e0491
 AUX libffado-2.1.0/0002-remove-O2.patch 639 SHA256 9e185836abe972dbeb250e9adf8878baf36d14bbce1c07fd173e7ec66cce5ccf SHA512 e31b376b8281703ccac8b4cb19a9f93f154c171b8b718aa722e2e9c0b534df24115658161ee41731559af0added7dd10895c79a1fbe68ea1c29109d42c3770df WHIRLPOOL 0e46ab21ba0f2f13004171b0a579c20d82963983f906efb982158a56fe6a8531cd2e0be935f34d8b6c96c3a3200892939f53cd710db7880053160e43006c39e0
-AUX libffado-9999-no-jackd-version.patch 2344 SHA256 3d086498a70273d65374a9397b8a0d7b3af8874128049b6e6d3eed99a9c9a413 SHA512 b48011219d11522a7e8633dce94426d62ef9a932523beca54158d86b3eedc05842dd35eb7c1a85382ef093cbb9bc13f44d95457270c365cd16cef53f5a230da3 WHIRLPOOL 5266e3932a4ed07183bda2e9b5e9f2670ff3038c5b992e5bb9c4c67bd8755ee5da10790d6d5fd80e57a9b6604146de8d3325e4adbc7ac38141617e326b545e8f
+AUX libffado-9999-no-jackd-version.patch 3205 SHA256 a5605ba1212439eb437a85dcda4af77540bdda84a7a4d4b83461ad7aaf378bc7 SHA512 1bcb72cd145c216eb0ad9d90452476640471b757c73d8870c115e2f1726d02dbba902299440b9d61f32bff11e295c1672a323c1a7e33719425ad5f4319cb0bc1 WHIRLPOOL 655ec1280881016a4f0b2149472d29aa083f36a65a264f2c6f94a2819526538e6e35f305ac65e6c01d6b9354e26edd663a922c8962e06a7a88daff320318d20e
 AUX libffado-9999/0001-honour-toolchain-env.patch 1306 SHA256 c8ae6927b896d570af7ef6c717339e64ed777ec3239f21d6b272d7b066aad141 SHA512 010b64d96dd2b802bcb5b78a38ed560af3c8fe0a4c0dc5eeb3c4d1dff94493f7fba176b0bebe5dcc18fe04e9688b2011970995f51a2eef217059e44f93f747ee WHIRLPOOL 04005043306b69216fe85ee3e2e2c6aafdf3b0876dec840b01c1623d25c810502406ed12c90c2f85ab2551e951ad9c7d48d4a46c611bba3b904bc56d8c3227b7
 AUX libffado-9999/0003-remove-O2.patch 638 SHA256 46c7906e3801dcbd24f43dc823f53c8f89f2160be0751c3fe134da7520dc5464 SHA512 b58aa81395b6a9818b45db06707122467542cf8ced487bd1b62536bdba748f6f4a3155485096c42d1bed07207bfdaabbcfdb73845a17fc9bae9bf4498cf89c91 WHIRLPOOL 35a21d38ef57653856763d3b37cfd79732305eb3b5ce8823323c8c8efebf79a8e7058cd4b698d50aac41465d747a1e19c8ce01469dee66911aa1500a01abbf7a
 DIST libffado-2.1.0.tgz 1153758 SHA256 dec0ea985e738be698c64fb3184844f4bc9bcb38349c20241027051686af9d85 SHA512 37179cb32920f16577e9f887cf90aca8d46081573080cbe408654c5234c7f45433521c977918057e330ddaa5fefa98c983ea7806d4f1f33c950112cbe66d013b WHIRLPOOL a4802d6a9318912f9d88fe17febdb05f0d990e124921b5d1d8c754ca1ca7d7457cf5aef8f662b074e0205df23b04fec0ad242640dff87903db32de0eccde9667
@@ -9,5 +9,5 @@
 EBUILD libffado-2.1.0.ebuild 2055 SHA256 df0976c788333d7e37d93d1606f816be696c87d799c536c42600c2d803be2c47 SHA512 08a566d8c08d04626e6732cafd329a90ee5ce21c354bebd4cdc3aacd25a3f100088f8269c605c814d05b8fa91205ee7fc170420a7a7fd0eb223f5735d9cf1b16 WHIRLPOOL 935bbd1f73e93900ac281c85b93aebcd95bbae91205021cafaceb6bab360e777046ca5e42ffd56e778e894b2ccdd6c192c2c53b05577c52919b84b82bdf0a094
 EBUILD libffado-9999-r1.ebuild 1882 SHA256 e13bbb5f85525c8cfd7b19f14e242cd48cd6990a573aa0e1e38f6fd13fcdf70f SHA512 3956553213f8f40cd148f9d85a234c96169563bf22853d9d07e2fd80b81bd759e70876d90fbef3d2af2d4a5883c72eaa45c212b66225a3913a9b5fb9e5041d98 WHIRLPOOL ad6a0808656cd4052f13e68c4e6f8beb41d336c93e83aea3241a0ed9889aee913b957f1b1b13d630654a5766025f2107f0a99bb931740ae397b417ca8110cf68
 EBUILD libffado-9999.ebuild 2056 SHA256 89d0a81dd2dcadf3b92812fcac813e3c57a06040c5d0f7e38365b858966d573b SHA512 a8481b1999f4aaa7e038d1a5c74081c209c0b51380e346f96b72473f27cbd8fd80d9e5ba01328ff9fecf6183ea3cccb8c660dafc6f3a5a863200d912239b843a WHIRLPOOL f4bf86bf34f30601e824f614f6362786bd454355e875aeb65e49d5f1096f71a95e860369623fef217396ee3ae5727ee52707fdef1314f3711b3a178ad7bb67cb
-MISC ChangeLog 3127 SHA256 73ee13fa27624e2f0aca1da9842eb1fbf29db326de5e02787257756348a7e32f SHA512 71f29187837d92b58b78fc7bb5db2228013d188ea185757181119fc871070a834ab1a2997aa1c8b5c374ccfa75bf603bbac7d4e436a785bc03218ee3707da429 WHIRLPOOL 125fe58ea599a345ddbdfb886b3fc988991b3f627b67af21377c0f612560a713daebc95afb1917f1cdf68a71a248242f83aed809487b1e07114557c70defcbed
+MISC ChangeLog 3447 SHA256 63c370ec219611f2bc3c8e00b4404d5e8287727aa046fe3eba5fa6653cb71e58 SHA512 1fe1e2da236d9feb3d43a141081d2ce5bdb1acfd720c3b966885bcb710be3aafb221b2e23364c2bb9077c13db834d5afcf8267b6abce53ea0ba6e45b46fd87ae WHIRLPOOL 072d6f48f0e561b0d434b981a01171a9983faf3f67cc90eec1630c99cef635fdbd932d0de395cd5f6a078d4b14b07cea62662f4e2652c93a5f2402f0050ef83f
 MISC metadata.xml 353 SHA256 608a4a6b28282ff02bda855731c407ccec16d907de90968b75241be123780a64 SHA512 f0399d9fbe3ffcd86066d1442c7a9dd178ac7601dea53280b6bd570bc5a839f4e63051b6bdd04d38c58a5edd6a39dac33af90b82bf46c633516d9ec3a5ee78b9 WHIRLPOOL a75323edc62d5cc245791c7d0cd56d16827d8f8778932c862684cbe59295821339ada5a3ed8a26de27a61f7f7c8ab0df8391efc4c42c608406314d9c579fad72

Modified: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch	2013-04-02 15:22:18 UTC (rev 2645)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch	2013-04-02 15:57:04 UTC (rev 2646)
@@ -1,6 +1,6 @@
 # AUTHOR: lilrc <lilrc@xxxxxxxxxxxxxxxxxxxxx>
 # A patch to avoid calling jackd --version from within the build system
-# which generates a sandbox vialoation. Instead use pkgconfig as jack
+# which generates a sandbox violation. Instead use pkgconfig as jack
 # will install the necessary pkgconfig files.
 
 diff -ur libffado-2.1.0.a/SConstruct libffado-2.1.0.b/SConstruct
@@ -51,3 +51,15 @@
      if env['ENABLE_SETBUFFERSIZE_API_VER'] == 'auto':
          if not(have_jack):
              print """
+diff -ur libffado-2.1.0.a/support/tools/ffado-diag-static libffado-2.1.0.b/support/tools/ffado-diag-static
+--- libffado-2.1.0.a/support/tools/ffado-diag-static	2010-05-03 21:37:15.000000000 +0200
++++ libffado-2.1.0.b/support/tools/ffado-diag-static	2013-04-02 17:45:15.924979761 +0200
+@@ -75,7 +75,7 @@
+     print "   gcc ............... %s" % get_version_first_line('gcc --version')
+     print "   g++ ............... %s" % get_version_first_line('g++ --version')
+     print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
+-    print "   jackd ............. %s" % get_version_first_line('jackd --version')
++    print "   jackd ............. %s" % get_version_first_line('pkg-config --modversion jack')
+     print "     path ............ %s" % get_command_path('jackd')
+     print "     flags ........... %s" % get_package_flags("jack")
+     print "   libraw1394 ........ %s" % get_package_version("libraw1394")

Modified: trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch	2013-04-02 15:22:18 UTC (rev 2645)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch	2013-04-02 15:57:04 UTC (rev 2646)
@@ -1,6 +1,6 @@
 # AUTHOR: lilrc <lilrc@xxxxxxxxxxxxxxxxxxxxx>
 # A patch to avoid calling jackd --version from within the build system
-# which generates a sandbox vialoation. Instead use pkgconfig as jack
+# which generates a sandbox violation. Instead use pkgconfig as jack
 # will install the necessary pkgconfig files.
 
 Index: SConstruct
@@ -52,3 +52,16 @@
      if env['ENABLE_SETBUFFERSIZE_API_VER'] == 'auto':
          if not(have_jack):
              print """
+Index: support/tools/ffado-diag-static
+===================================================================
+--- support/tools/ffado-diag-static	(revision 2285)
++++ support/tools/ffado-diag-static	(working copy)
+@@ -75,7 +75,7 @@
+     print "   gcc ............... %s" % get_version_first_line('gcc --version')
+     print "   g++ ............... %s" % get_version_first_line('g++ --version')
+     print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
+-    print "   jackd ............. %s" % get_version_first_line('jackd --version')
++    print "   jackd ............. %s" % get_version_first_line('pkg-config --modversion jack')
+     print "     path ............ %s" % get_command_path('jackd')
+     print "     flags ........... %s" % get_package_flags("jack")
+     print "   libraw1394 ........ %s" % get_package_version("libraw1394")


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