| [proaudio] [2637] media-libs/libffado: Patch to prevent jackd --version being called. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2637
Author: lilrc
Date: 2013-04-01 14:39:47 +0200 (Mon, 01 Apr 2013)
Log Message:
-----------
media-libs/libffado: Patch to prevent jackd --version being called. Move to EAPI 5 and base and python-single-r1 eclasses. Specify udev rules directory. Do python optimizations before merging.
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libffado/ChangeLog
trunk/overlays/proaudio/media-libs/libffado/Manifest
Added Paths:
-----------
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
trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild
trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild
Modified: trunk/overlays/proaudio/media-libs/libffado/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2013-03-31 22:03:19 UTC (rev 2636)
+++ trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2013-04-01 12:39:47 UTC (rev 2637)
@@ -2,6 +2,19 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libffado-9999-r1 (01 Apr 2013)
+*libffado-2.1.0-r1 (01 Apr 2013)
+
+ 01 Apr 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ +libffado-2.1.0-r1.ebuild, +files/libffado-2.1.0-no-jackd-version.patch,
+ +libffado-9999-r1.ebuild, +files/libffado-9999-no-jackd-version.patch:
+ Add patch to avoid build system calling jackd --version. Addpredicts
+ deleted.
+ Move to EAPI 5, base eclass and python-single-r1 eclass.
+ Explicitly specify udev rules directory.
+ Optimize before merging to file system (gives portage better file
+ control)
+
03 Feb 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
libffado-2.1.0.ebuild:
Keyworded for ~ppc. This is not completely OK as dbus-c++ does not
Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest 2013-03-31 22:03:19 UTC (rev 2636)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest 2013-04-01 12:39:47 UTC (rev 2637)
@@ -1,9 +1,13 @@
+AUX libffado-2.1.0-no-jackd-version.patch 2398 SHA256 c873d4f8028698b363a2ced5b688f8f5cc3069c92b7f1c926ddd3cd659d2df00 SHA512 c54cd815dea8cc1de738e6c65a8d85256e261aaf86d5f23c0392567dfa18174570232a1be9492ef4daf5b68fdee8ec0fbfdcfa86e04c818484c66da0f6e54a60 WHIRLPOOL 6922af7c106a869033f40c00ae00df6c42a17cf64f789ee62d3736001b065150c6580ad400743dc93bc434067de50e87438d9952c51005427327ed947184cfd6
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/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
+EBUILD libffado-2.1.0-r1.ebuild 1871 SHA256 fcae7b7ff53f36fb1c75789c12e477995d5b7b02a42dc6f9dddba9ca9c942c59 SHA512 2e8293e64ed5ec12b12f36ba8da16b41a0e9944fa1754de135f312562661f5adf14b1345f0a211cca03275f5f0fe396c77b9aaece454f1d6c90210ddde40c072 WHIRLPOOL 13014aca13bef8f1ec15450a280db397b96ee691f88e0262bdd6dacdf34f5224bc87ea8d57ecd04103fb931c060d900444be5087f9db1a6837ecc81c01463ace
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 2582 SHA256 f01538b8ad0ac8208e06e04b05fc7f94891e66b0e7c18044ef8ff3bcb2174512 SHA512 5a2e18e23f437d63386458fec9f6a38fec96bfbc92551a7b08e24eac457f5a19c69723ba2976ae1da6a6a24a853754aa7877f2525f16e9300564cb478e73b02d WHIRLPOOL 9832d7a14ec0c810cce7189f89c993ae5fd8b9a7d4be6a41a7f533a4936b001fc672458c5feb1490496deb8a06fae438f90c88165e5f272e6d97d93d63bc6315
+MISC ChangeLog 3127 SHA256 73ee13fa27624e2f0aca1da9842eb1fbf29db326de5e02787257756348a7e32f SHA512 71f29187837d92b58b78fc7bb5db2228013d188ea185757181119fc871070a834ab1a2997aa1c8b5c374ccfa75bf603bbac7d4e436a785bc03218ee3707da429 WHIRLPOOL 125fe58ea599a345ddbdfb886b3fc988991b3f627b67af21377c0f612560a713daebc95afb1917f1cdf68a71a248242f83aed809487b1e07114557c70defcbed
MISC metadata.xml 353 SHA256 608a4a6b28282ff02bda855731c407ccec16d907de90968b75241be123780a64 SHA512 f0399d9fbe3ffcd86066d1442c7a9dd178ac7601dea53280b6bd570bc5a839f4e63051b6bdd04d38c58a5edd6a39dac33af90b82bf46c633516d9ec3a5ee78b9 WHIRLPOOL a75323edc62d5cc245791c7d0cd56d16827d8f8778932c862684cbe59295821339ada5a3ed8a26de27a61f7f7c8ab0df8391efc4c42c608406314d9c579fad72
Added: 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 (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0-no-jackd-version.patch 2013-04-01 12:39:47 UTC (rev 2637)
@@ -0,0 +1,53 @@
+# 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
+# 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 """
Added: 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 (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999-no-jackd-version.patch 2013-04-01 12:39:47 UTC (rev 2637)
@@ -0,0 +1,54 @@
+# 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
+# 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 | 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 """
Copied: trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild (from rev 2636, trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0-r1.ebuild 2013-04-01 12:39:47 UTC (rev 2637)
@@ -0,0 +1,81 @@
+# 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
+}
Copied: trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild (from rev 2636, trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-9999-r1.ebuild 2013-04-01 12:39:47 UTC (rev 2637)
@@ -0,0 +1,81 @@
+# 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 subversion
+
+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}";
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="debug qt4 +test-programs"
+
+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
+ qt4? (
+ dev-python/PyQt4[${PYTHON_USEDEP}]
+ >=dev-python/dbus-python-0.83.0[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+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
+}