| [proaudio] [2912] media-libs/libffado: patches applied upstream, backport to 2.2.1, remove old ebuild, fix deps, refer to ChangeLog |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2912
Author: lilrc
Date: 2014-12-15 19:52:27 +0100 (Mon, 15 Dec 2014)
Log Message:
-----------
media-libs/libffado: patches applied upstream, backport to 2.2.1, remove old ebuild, fix deps, refer to ChangeLog
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libffado/ChangeLog
trunk/overlays/proaudio/media-libs/libffado/Manifest
trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1.ebuild
trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-flags.patch
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-jack-detect.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch
trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/
trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch
trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild
Modified: trunk/overlays/proaudio/media-libs/libffado/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,7 +1,24 @@
# ChangeLog for media-libs/libffado
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Dec 2014; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ -libffado-2.1.0-r1.ebuild, libffado-2.2.1.ebuild, libffado-9999-r1.ebuild,
+ -files/libffado-2.1.0, -files/libffado-2.1.0-no-jackd-version.patch,
+ -files/libffado-2.1.0/0001-honour-toolchain-env.patch,
+ -files/libffado-2.1.0/0002-remove-O2.patch,
+ +files/libffado-2.2.1-flags.patch, +files/libffado-2.2.1-jack-detect.patch,
+ -files/libffado-9999, -files/libffado-9999-no-jackd-version.patch,
+ -files/libffado-9999/0001-honour-toolchain-env.patch,
+ -files/libffado-9999/0003-remove-O2.patch:
+ removed old ebuild
+ good patches applied upstream, backported ones used for version 2.2.1
+ make ebuilds almost identic
+ remove version specifiers from deps as there are no older version in tree
+ depend on dev-libs/libconfig[cxx]
+ depend on dev-python/PyQt4[dbus]
+ make sure PYTHON_REQUIRED_USE is used properly
+
21 Sep 2014; Matt Henley <nwmatt@xxxxxxxxx>
version bump to libffado-2.2.1 ebuild from Allan (sonofzev@xxxxxxxxxxxx)
Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,13 +1,7 @@
-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 3217 SHA256 5a62c1e5bf18cfe04434fd9e73bc143f8f54188616ce31c5942505514def021b SHA512 4a97d4bf45e3266d55332aa8e86f856c7b7aa609dafe46b3d47c46c9d9d83b8e720947d403346ab2066748c5e00dae3ad7a5e042cf143e4a38d5f288a8a9f927 WHIRLPOOL c9330e2bf717f1fbe136e966acbc9cf203e1a6c9001555e2e492752520bc81e442cde76152177059bb5c2d27a2e0cc831a47fb28678cc448b38403f87b3af5c5
-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
+AUX libffado-2.2.1-flags.patch 4064 SHA256 85c0686d252678d67da600fde931a10adb2d88243ad9fcde56b377d7dec7fdf1 SHA512 4674efbb9c70045520e7efd9789bba016fb91a6dd0b4021e2069b93c559d3f74c5c23af573da28427846aa8f5bad7952dd6e39fc4e9c6be7a9982ca60ff222a0 WHIRLPOOL fe021e45c0824df293f7bfccba143b6d4a148ea5ddb7c6847b906c7f85369d3639815798c115343818c9b8caf1d4e1be9ffe437b1e6f86f39c126272d08bce4b
+AUX libffado-2.2.1-jack-detect.patch 2247 SHA256 bfe097ee811573d647e26a80c1999691fb19263d5434f18c0cd2c16827760d4c SHA512 a184ed839ffd8f13c6b2fd7b58e03e3d4b670375571ed414d741a89b288644090788a483482e73d65f1691f11b96408b512fe4a19df05edfe2599a4910cd6fa5 WHIRLPOOL 2dc7c485e1b0bea34fe20a8d411aa67d5e618d0da699ca0a5fc62838df68880dc947b6365bca56dcd9d374d970535562faa8d57b7f8fb3c87b06f2e1929a6c09
DIST libffado-2.2.1.tgz 1227685 SHA256 9f299b8ecd9885338aeae8c7f2fc10af9afb85ca4384256d485b010a128b35f6 SHA512 310741703912dd273458d0ecc4aca43af1735e15a19704e39b0c660212a34875e9c6086a325914d70d2373ff56b888acb4d925778db8cc3b9b2e8866e0a7b042 WHIRLPOOL ce03c47121a1afa85ed5120e1e77aa5d94dbf49129201a894c4523c8abd07d5d6485fbb68819ef522afd5a987416098ef6f95ab8984f62c325be735833136d22
-EBUILD libffado-2.1.0-r1.ebuild 1871 SHA256 fcae7b7ff53f36fb1c75789c12e477995d5b7b02a42dc6f9dddba9ca9c942c59 SHA512 2e8293e64ed5ec12b12f36ba8da16b41a0e9944fa1754de135f312562661f5adf14b1345f0a211cca03275f5f0fe396c77b9aaece454f1d6c90210ddde40c072 WHIRLPOOL 13014aca13bef8f1ec15450a280db397b96ee691f88e0262bdd6dacdf34f5224bc87ea8d57ecd04103fb931c060d900444be5087f9db1a6837ecc81c01463ace
-EBUILD libffado-2.2.1.ebuild 1876 SHA256 0f48ea28301a004519c05a867c694cb4b4c9ef1cd1b68a4f8906c52eec3e1f61 SHA512 e72bf466164ed4c736195af1860bf044db891168b9f165df68c6832ca174e0d3d8cb83dc2be3b7524fc42a8c344c3adbde30a98a48a02c62dbe7f206023d9f33 WHIRLPOOL fdf4ad51463c8bfb8c3fe1e6623e74205633f634e66dc8fd936f4292dbbb17955cfe17b08c77979eb2feb3208b9f9770f9ae1b9245cfaefd550923d5365dffa9
-EBUILD libffado-9999-r1.ebuild 1882 SHA256 e13bbb5f85525c8cfd7b19f14e242cd48cd6990a573aa0e1e38f6fd13fcdf70f SHA512 3956553213f8f40cd148f9d85a234c96169563bf22853d9d07e2fd80b81bd759e70876d90fbef3d2af2d4a5883c72eaa45c212b66225a3913a9b5fb9e5041d98 WHIRLPOOL ad6a0808656cd4052f13e68c4e6f8beb41d336c93e83aea3241a0ed9889aee913b957f1b1b13d630654a5766025f2107f0a99bb931740ae397b417ca8110cf68
-MISC ChangeLog 3869 SHA256 60abe58729a64400a0024c2af8a0934c68e001743b7dd170f385fc2a12e3fcb9 SHA512 a365127e0287185190cb935ece46b00787b503084da89714c5206e39359c4f419f6d0cb7baf63f7a4ef37da4ec457098570235e667ebb2eee1a0a4f357a14cff WHIRLPOOL 390434c54396a052ce6ccada59b9659843d9aab8b089778ec8100a458c218b63122a47cc2d8bd5a74200b8bf6e04e59ac380d164e7caddfd7d9e1135dd81a5c6
+EBUILD libffado-2.2.1.ebuild 2154 SHA256 9600223a859ff36bc43b43d3387a94ec1699235852d1ce675e832b795bfa41aa SHA512 b531cefdfb3a4f3c7ad4d664e17fb33143893b3d362f1b3957640ca820e9b3cbe9be265f082a6cd1cc9a847c24e4fcdc6dcbbf39fe5bb441904b4fd7aecc3490 WHIRLPOOL 71c088f84a13bed9274ff8e9e53c713cb9c11ce2f0c36567d07749985fa778f40f30b2dba0d353c1f0680c6c9eff59ccbcdcd4cecdb34e59ae30bf7404b1f787
+EBUILD libffado-9999-r1.ebuild 2071 SHA256 efca9728ec15648b0385de645ac3dc0b26d2ba6d27353134944d154edb837c62 SHA512 5f72b2015d0145197ef4d4abc1703bf97bb8a69d0f652aee210a9bb52746ddad8c2f5bebc97dbf89e6f3b579533d7b0e0d8979f84c925e4b4cbb818a364f4928 WHIRLPOOL 640baf626e4deded2da46f154d84a4bb6d16856d8ef04e018ede88034489ffb4af0252147a2c742716cef45fedd8543811f47d701828bbad48057d8e6f9bf095
+MISC ChangeLog 4753 SHA256 bfa8a277c5dffe3cbd2579770c5d9a28ff8708e01c38b43e876dcdc73004a584 SHA512 d9e08a6579bd9ade4740db05a1a0b9f8687d6dc72910fbf7e293da528bc205f956d9accc0cee13fc815c192b6665f0cb5e669d0ebdbe9f4e1a386e1c01e1c1dc WHIRLPOOL ca81e2aa01fafb99d791d16234e51e8ebabb2556ce37fa392c8806ecaf051ee3f39a3febb27948352c563ed654ef5e4925cbb593ae0f2f19a755780205e024ff
MISC metadata.xml 353 SHA256 608a4a6b28282ff02bda855731c407ccec16d907de90968b75241be123780a64 SHA512 f0399d9fbe3ffcd86066d1442c7a9dd178ac7601dea53280b6bd570bc5a839f4e63051b6bdd04d38c58a5edd6a39dac33af90b82bf46c633516d9ec3a5ee78b9 WHIRLPOOL a75323edc62d5cc245791c7d0cd56d16827d8f8778932c862684cbe59295821339ada5a3ed8a26de27a61f7f7c8ab0df8391efc4c42c608406314d9c579fad72
Deleted: 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 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,65 +0,0 @@
-# AUTHOR: lilrc <lilrc@xxxxxxxxxxxxxxxxxxxxx>
-# A patch to avoid calling jackd --version from within the build system
-# 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
---- libffado-2.1.0.a/SConstruct 2013-04-01 12:55:08.239992516 +0200
-+++ libffado-2.1.0.b/SConstruct 2013-04-01 13:54:42.019972442 +0200
-@@ -194,16 +194,6 @@
- # restricted to 0-255.
- return (int(maj) << 24) | (int(min) << 8) | int(patch)
-
--def CheckJackdVer():
-- print 'Checking jackd version...',
-- ret = Popen("which jackd >/dev/null 2>&1 && jackd --version | cut -d ' ' -f 3", shell=True, stdout=PIPE).stdout.read()[:-1]
-- if (ret == ""):
-- print "not installed"
-- return -1
-- else:
-- print ret
-- return VersionInt(ret)
--
- if env['SERIALIZE_USE_EXPAT']:
- env['SERIALIZE_USE_EXPAT']=1
- else:
-@@ -248,24 +238,9 @@
- if not env['SERIALIZE_USE_EXPAT']:
- pkgs['libxml++-2.6'] = '2.13.0'
-
-- # Provide a way for users to compile newer libffado which will work
-- # against older jack installations which will not accept the new API
-- # version reported at runtime.
-- jackd_ver = CheckJackdVer()
-- if (jackd_ver != -1):
-- # If jackd is available, use the version number reported by it. This
-- # means users don't have to have jack development files present on
-- # their system for this to work.
-- have_jack = (jackd_ver >= VersionInt('0.0.0'))
-- good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.122.0'))
-- good_jack2 = (jackd_ver >= VersionInt('1.9.9'))
-- else:
-- # Jackd is not runnable. Attempt to identify a version from
-- # pkgconfig on the off-chance jack details are available from there.
-- print "Will retry jack detection using pkg-config"
-- have_jack = conf.CheckPKG('jack >= 0.0.0')
-- good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0')
-- good_jack2 = conf.CheckPKG('jack >= 1.9.9')
-+ have_jack = conf.CheckPKG('jack >= 0.0.0')
-+ good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0')
-+ good_jack2 = conf.CheckPKG('jack >= 1.9.9')
- 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")
Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-flags.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-flags.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-flags.patch 2014-12-15 18:52:27 UTC (rev 2912)
@@ -0,0 +1,83 @@
+# Patch to make the build system honour CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS.
+# See http://subversion.ffado.org/ticket/382 for more information.
+# Applied upstream.
+
+Index: SConstruct
+===================================================================
+--- SConstruct (revision 2575)
++++ SConstruct (revision 2577)
+@@ -77,7 +77,8 @@
+ EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2),
+ BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ),
+ BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ),
+- ( "COMPILE_FLAGS", "Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their built.\n Using this is not supported by the ffado-devs!" ),
++ BoolVariable( "CUSTOM_ENV", "Respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS.\nOnly meant for distributors and gentoo-users who want to over-optimize their build.\n Using this is not supported by the ffado-devs!", False ),
++ ( "COMPILE_FLAGS", "Deprecated (use CFLAGS and CXXFLAGS with CUSTOM_ENV=True instead). Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their build.\n Using this is not supported by the ffado-devs!" ),
+ EnumVariable( "ENABLE_SETBUFFERSIZE_API_VER", "Report API version at runtime which includes support for dynamic buffer resizing (requires recent jack).", 'auto', allowed_values=('auto', 'true', 'false', 'force'), ignorecase=2),
+
+ )
+@@ -87,14 +88,42 @@
+
+ env = Environment( tools=['default','scanreplace','pyuic','pyuic4','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts )
+
++custom_flags = False
++
+ if env.has_key('COMPILE_FLAGS') and len(env['COMPILE_FLAGS']) > 0:
++ print "The COMPILE_FLAGS option is deprecated. Use CFLAGS and CXXFLAGS with CUSTOM_ENV=True instead"
++ custom_flags = True
++ env.MergeFlags(env['COMPILE_FLAGS'])
++
++if env['CUSTOM_ENV']:
++ custom_flags = True
++
++ # Honour the user choice of compiler (if any).
++ if os.environ.has_key('CC') and len(os.environ['CC']) > 0:
++ env['CC'] = os.environ['CC']
++ if os.environ.has_key('CXX') and len(os.environ['CXX']) > 0:
++ env['CXX'] = os.environ['CXX']
++
++ # Honour the user supplied flags (if any), but notify the user that this is not supported.
++ if os.environ.has_key('CFLAGS') and len(os.environ['CFLAGS']) > 0:
++ env.Append(CFLAGS = str(os.environ['CFLAGS'].replace('\"', '')))
++ if os.environ.has_key('CXXFLAGS') and len(os.environ['CXXFLAGS']) > 0:
++ env.Append(CXXFLAGS = str(os.environ['CXXFLAGS'].replace('\"', '')))
++ if os.environ.has_key('LDFLAGS') and len(os.environ['LDFLAGS']) > 0:
++ env.Append(LINKFLAGS = str(os.environ['LDFLAGS'].replace('\"', '')))
++
++if custom_flags:
+ print '''
+ * Usage of additional flags is not supported by the ffado-devs.
+ * Use at own risk!
+ *
+- * Currentl value is '%s'
+- ''' % env['COMPILE_FLAGS']
+- env.MergeFlags(env['COMPILE_FLAGS'])
++ * Flags in use:
++ * CC = %s
++ * CXX = %s
++ * CFLAGS = %s
++ * CXXFLAGS = %s
++ * LDFLAGS = %s
++''' % (env['CC'], env['CXX'], env['CFLAGS'], env['CXXFLAGS'], env['LINKFLAGS'])
+
+ Help( """
+ For building ffado you can set different options as listed below. You have to
+@@ -331,7 +360,7 @@
+ oldcf = env['CFLAGS']
+ else:
+ oldcf = ""
+- oldcf = env.Append(CFLAGS = '-std=c99')
++ env.Append(CFLAGS = '-std=c99')
+ if conf.CheckLibWithHeader( "m", "math.h", "c", "lrint(3.2);" ):
+ HAVE_LRINT = 1
+ else:
+@@ -415,7 +444,8 @@
+ print "Doing a debug build"
+ env.MergeFlags( "-Wall -g -DDEBUG" )
+ env['DEBUG_MESSAGES'] = True
+-else:
++elif not custom_flags:
++ # Only merge -O2 to flags if the user has not specified custom flags.
+ env.MergeFlags( "-O2" )
+
+ if env['DEBUG_MESSAGES']:
Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-jack-detect.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-jack-detect.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-jack-detect.patch 2014-12-15 18:52:27 UTC (rev 2912)
@@ -0,0 +1,44 @@
+# Patch to change the order of the checks for jack version. See
+# http://subversion.ffado.org/ticket/381 for more information.
+# Applied upstream.
+
+Index: SConstruct
+===================================================================
+--- SConstruct (revision 2574)
++++ SConstruct (revision 2575)
+@@ -250,21 +250,21 @@
+ # Provide a way for users to compile newer libffado which will work
+ # against older jack installations which will not accept the new API
+ # version reported at runtime.
+- jackd_ver = CheckJackdVer()
+- if (jackd_ver != -1):
+- # If jackd is available, use the version number reported by it. This
+- # means users don't have to have jack development files present on
+- # their system for this to work.
+- have_jack = (jackd_ver >= VersionInt('0.0.0'))
+- good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.121.4'))
+- good_jack2 = (jackd_ver >= VersionInt('1.9.9'))
++ have_jack = conf.CheckPKG('jack')
++ if have_jack:
++ good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.121.4')
++ good_jack2 = conf.CheckPKG('jack >= 1.9.9')
+ else:
+- # Jackd is not runnable. Attempt to identify a version from
+- # pkgconfig on the off-chance jack details are available from there.
+- print "Will retry jack detection using pkg-config"
+- have_jack = conf.CheckPKG('jack >= 0.0.0')
+- good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0')
+- good_jack2 = conf.CheckPKG('jack >= 1.9.9')
++ jackd_ver = CheckJackdVer()
++ if (jackd_ver != -1):
++ # If jackd is unknown to pkg-config but is never-the-less
++ # runnable, use the version number reported by it. This means
++ # users don't have to have jack development files present on
++ # their system for this to work.
++ have_jack = (jackd_ver >= VersionInt('0.0.0'))
++ good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.121.4'))
++ good_jack2 = (jackd_ver >= VersionInt('1.9.9'))
++
+ if env['ENABLE_SETBUFFERSIZE_API_VER'] == 'auto':
+ if not(have_jack):
+ print """
Deleted: 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 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,67 +0,0 @@
-# AUTHOR: lilrc <lilrc@xxxxxxxxxxxxxxxxxxxxx>
-# A patch to avoid calling jackd --version from within the build system
-# which generates a sandbox violation. Instead use pkgconfig as jack
-# will install the necessary pkgconfig files.
-
-Index: SConstruct
-===================================================================
---- SConstruct (revision 2285)
-+++ SConstruct (working copy)
-@@ -194,16 +194,6 @@
- # restricted to 0-255.
- return (int(maj) << 24) | (int(min) << 8) | int(patch)
-
--def CheckJackdVer():
-- print 'Checking jackd version...',
-- ret = Popen("which jackd >/dev/null 2>&1 && jackd --version | tail -n 1 | cut -d ' ' -f 3", shell=True, stdout=PIPE).stdout.read()[:-1]
-- if (ret == ""):
-- print "not installed"
-- return -1
-- else:
-- print ret
-- return VersionInt(ret)
--
- if env['SERIALIZE_USE_EXPAT']:
- env['SERIALIZE_USE_EXPAT']=1
- else:
-@@ -248,24 +238,9 @@
- if not env['SERIALIZE_USE_EXPAT']:
- pkgs['libxml++-2.6'] = '2.13.0'
-
-- # Provide a way for users to compile newer libffado which will work
-- # against older jack installations which will not accept the new API
-- # version reported at runtime.
-- jackd_ver = CheckJackdVer()
-- if (jackd_ver != -1):
-- # If jackd is available, use the version number reported by it. This
-- # means users don't have to have jack development files present on
-- # their system for this to work.
-- have_jack = (jackd_ver >= VersionInt('0.0.0'))
-- good_jack1 = (jackd_ver < VersionInt('1.9.0')) and (jackd_ver >= VersionInt('0.121.4'))
-- good_jack2 = (jackd_ver >= VersionInt('1.9.9'))
-- else:
-- # Jackd is not runnable. Attempt to identify a version from
-- # pkgconfig on the off-chance jack details are available from there.
-- print "Will retry jack detection using pkg-config"
-- have_jack = conf.CheckPKG('jack >= 0.0.0')
-- good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0')
-- good_jack2 = conf.CheckPKG('jack >= 1.9.9')
-+ have_jack = conf.CheckPKG('jack >= 0.0.0')
-+ good_jack1 = conf.CheckPKG('jack < 1.9.0') and conf.CheckPKG('jack >= 0.122.0')
-+ good_jack2 = conf.CheckPKG('jack >= 1.9.9')
- 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")
Deleted: trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit base scons-utils eutils toolchain-funcs multilib python-single-r1 udev
-
-DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
-HOMEPAGE="http://www.ffado.org";
-SRC_URI="http://www.ffado.org/files/${P}.tgz";
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="debug qt4 +test-programs"
-
-RDEPEND=">=dev-cpp/libxmlpp-2.6.13
- >=dev-libs/dbus-c++-0.9.0
- >=dev-libs/libconfig-1.4.8
- >=media-libs/alsa-lib-1.0.0
- >=media-libs/libiec61883-1.1.0
- >=sys-apps/dbus-1.0
- >=sys-libs/libraw1394-2.0.7
- >=sys-libs/libavc1394-0.5.3
- qt4? (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-0.83.0[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-RESTRICT="mirror"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
- "${FILESDIR}/${P}"
- "${FILESDIR}/${P}-no-jackd-version.patch"
-)
-EPATCH_SUFFIX="patch"
-
-src_prepare() {
- base_src_prepare
- python_fix_shebang "${S}"
-}
-
-src_configure() {
- myesconsargs=(
- PREFIX="${EPREFIX}/usr"
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- MANDIR="${EPREFIX}/usr/share/man"
- UDEVDIR="$(get_udevdir)/rules.d"
- $(use_scons debug DEBUG)
- $(use_scons test-programs BUILD_TESTS)
- # ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
- # -fomit-frame-pointer is added also which can cripple debugging.
- # we set flags from portage instead
- ENABLE_OPTIMIZATIONS=False
- )
-}
-
-src_compile () {
- tc-export CC CXX
- escons
-}
-
-src_install () {
- escons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-
- base_src_install_docs
-
- python_optimize "${D}"
-
- if use qt4; then
- newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
- newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
- fi
-}
Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1.ebuild 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1.ebuild 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,47 +1,63 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
+[[ "${PV}" = "9999" ]] && inherit subversion
inherit base scons-utils eutils toolchain-funcs multilib python-single-r1 udev
DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
HOMEPAGE="http://www.ffado.org";
-SRC_URI="http://www.ffado.org/files/${P}.tgz";
+RESTRICT="mirror"
+if [ "${PV}" = "9999" ]; then
+ ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}";
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://www.ffado.org/files/${P}.tgz";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
IUSE="debug qt4 +test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND=">=dev-cpp/libxmlpp-2.6.13
- >=dev-libs/dbus-c++-0.9.0
- >=dev-libs/libconfig-1.4.8
- >=media-libs/alsa-lib-1.0.0
- >=media-libs/libiec61883-1.1.0
- >=sys-apps/dbus-1.0
- >=sys-libs/libraw1394-2.0.7
- >=sys-libs/libavc1394-0.5.3
+RDEPEND="dev-cpp/libxmlpp
+ dev-libs/dbus-c++
+ dev-libs/libconfig[cxx]
+ media-libs/alsa-lib
+ media-libs/libiec61883
+ media-sound/jack-audio-connection-kit
+ sys-apps/dbus
+ sys-libs/libraw1394
+ sys-libs/libavc1394
+ ${PYTHON_DEPS}
qt4? (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-0.83.0[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
+ dev-python/PyQt4[dbus,${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-RESTRICT="mirror"
-
DOCS=( AUTHORS ChangeLog README )
-#PATCHES=(
-# "${FILESDIR}/${P}"
-# "${FILESDIR}/${P}-no-jackd-version.patch"
-#)
-#EPATCH_SUFFIX="patch"
+PATCHES=(
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-jack-detect.patch
+)
+src_unpack() {
+ if [ "${PV}" = "9999" ]; then
+ subversion_src_unpack
+ else
+ default
+ fi
+}
+
src_prepare() {
base_src_prepare
python_fix_shebang "${S}"
@@ -53,6 +69,7 @@
LIBDIR="${EPREFIX}/usr/$(get_libdir)"
MANDIR="${EPREFIX}/usr/share/man"
UDEVDIR="$(get_udevdir)/rules.d"
+ CUSTOM_ENV=True
$(use_scons debug DEBUG)
$(use_scons test-programs BUILD_TESTS)
# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild 2014-12-11 15:22:02 UTC (rev 2911)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild 2014-12-15 18:52:27 UTC (rev 2912)
@@ -1,46 +1,57 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-inherit base scons-utils eutils toolchain-funcs multilib python-single-r1 udev subversion
+[[ "${PV}" = "9999" ]] && inherit subversion
+inherit base scons-utils eutils toolchain-funcs multilib python-single-r1 udev
DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
HOMEPAGE="http://www.ffado.org";
-ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}";
+RESTRICT="mirror"
+if [ "${PV}" = "9999" ]; then
+ ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}";
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://www.ffado.org/files/${P}.tgz";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="0"
IUSE="debug qt4 +test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror"
-
-RDEPEND=">=dev-cpp/libxmlpp-2.6.13
- >=dev-libs/dbus-c++-0.9.0
- >=dev-libs/libconfig-1.4.8
- >=media-libs/alsa-lib-1.0.0
- >=media-libs/libiec61883-1.1.0
- >=sys-apps/dbus-1.0
- >=sys-libs/libraw1394-2.0.7
- >=sys-libs/libavc1394-0.5.3
+RDEPEND="dev-cpp/libxmlpp
+ dev-libs/dbus-c++
+ dev-libs/libconfig[cxx]
+ media-libs/alsa-lib
+ media-libs/libiec61883
+ media-sound/jack-audio-connection-kit
+ sys-apps/dbus
+ sys-libs/libraw1394
+ sys-libs/libavc1394
+ ${PYTHON_DEPS}
qt4? (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-0.83.0[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
+ dev-python/PyQt4[dbus,${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
DOCS=( AUTHORS ChangeLog README )
-PATCHES=(
- "${FILESDIR}/${P}"
- "${FILESDIR}/${P}-no-jackd-version.patch"
-)
-EPATCH_SUFFIX="patch"
+src_unpack() {
+ if [ "${PV}" = "9999" ]; then
+ subversion_src_unpack
+ else
+ default
+ fi
+}
src_prepare() {
base_src_prepare
@@ -53,6 +64,7 @@
LIBDIR="${EPREFIX}/usr/$(get_libdir)"
MANDIR="${EPREFIX}/usr/share/man"
UDEVDIR="$(get_udevdir)/rules.d"
+ CUSTOM_ENV=True
$(use_scons debug DEBUG)
$(use_scons test-programs BUILD_TESTS)
# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly