| [proaudio] [2924] media-libs/libffado: patch away automagic dependency on PyQt4 and friends, depend on xdg-utils if qt4 flag is set |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2924
Author: lilrc
Date: 2015-03-26 21:17:40 +0100 (Thu, 26 Mar 2015)
Log Message:
-----------
media-libs/libffado: patch away automagic dependency on PyQt4 and friends, depend on xdg-utils if qt4 flag is set
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libffado/ChangeLog
trunk/overlays/proaudio/media-libs/libffado/Manifest
trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-mixer.patch
trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r2.ebuild
Modified: trunk/overlays/proaudio/media-libs/libffado/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2015-03-22 07:25:38 UTC (rev 2923)
+++ trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2015-03-26 20:17:40 UTC (rev 2924)
@@ -2,6 +2,14 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libffado-2.2.1-r2 (26 Mar 2015)
+
+ 26 Mar 2015; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ +libffado-2.2.1-r2.ebuild, libffado-9999.ebuild,
+ +files/libffado-2.2.1-mixer.patch:
+ patch away automagic dependency on PyQt4 and friends
+ depend on qt4? ( xdg-utils ) too as it is an automagic dependency
+
22 Mar 2015; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
libffado-2.2.1-r1.ebuild, libffado-9999.ebuild,
-files/libffado-2.2.1-detect-userspace.patch,
Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest 2015-03-22 07:25:38 UTC (rev 2923)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest 2015-03-26 20:17:40 UTC (rev 2924)
@@ -1,9 +1,11 @@
AUX libffado-2.2.1-detect-userspace-env.patch 3359 SHA256 cf25e2409b88a839cd613f608c07a90a8bc3a3380b1eea8f1f95e50300d8cdc4 SHA512 eefab8826173c2a49d3e0098673d5d7b57567deb081f4a9ce1ab10722905404420e04914bfe43fa014c8e53715ac9279e416254d04bf8f3cef088da6ff84d8c0 WHIRLPOOL 656aff77e8a47f64334fae3a4e4e75bcfbcd6188317295360de1556b800ff71d66e4ac9a425534e52c8e666bc80ebdf4ac7356d37b29e6b3b845cef80df605c9
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
+AUX libffado-2.2.1-mixer.patch 4002 SHA256 f7c2f333f8d6b6cd46d7a48e384769a8c345ef70fdec827a993ed31061ce0947 SHA512 ead0b6ddb2469097125c9f5dbca88fc83dabbb954113f36050a9fd8fcb8aec56e914a253e283ad240d597fea60eef469e84f129b1bf8d0212186c960522ec5e0 WHIRLPOOL 212f062e2bbb41f5172a1fa8f5c94e1891b3b9871e03bb983228d2fab992ea4457a0373dcd21f8405eb069b95ba0f14e64078e8d027116e9ca145d355bdd5102
DIST libffado-2.2.1.tgz 1227685 SHA256 9f299b8ecd9885338aeae8c7f2fc10af9afb85ca4384256d485b010a128b35f6 SHA512 310741703912dd273458d0ecc4aca43af1735e15a19704e39b0c660212a34875e9c6086a325914d70d2373ff56b888acb4d925778db8cc3b9b2e8866e0a7b042 WHIRLPOOL ce03c47121a1afa85ed5120e1e77aa5d94dbf49129201a894c4523c8abd07d5d6485fbb68819ef522afd5a987416098ef6f95ab8984f62c325be735833136d22
EBUILD libffado-2.2.1-r1.ebuild 2230 SHA256 d471852817183c1a6af13db9f32c6773083261453a51b9e220732c39c7f5c318 SHA512 8af5c1775be97cc0ef860065c94ab7f6606bb8f614e62cfa510e77beae0e0097a04eb8bb8689f5ca4ffd649662ee8735670c040ff04881da30a6655647c08c54 WHIRLPOOL 43109ebde0f7b4dc826044cf467edb979ede1498443c01c193ed3d90c9b3da28f96d1445577e998c7ae556070393041a505e6e0789338f257f36fedd93eb2338
+EBUILD libffado-2.2.1-r2.ebuild 2325 SHA256 f4d25080f79bd707063f583d7a8ee3973593ca2dc01b67644aa95c0868e901ac SHA512 e5fc13c725ce35ca0cb85d8b7998baef5455b03864cf2a0ffe285880a1b179dda735389c617f2d86f478b4d21f2018d071d81aaa9b906c3802581c4aa19d3b6e WHIRLPOOL e9ef6bfd53d51d69b0b0adc10da0c891c299030943497baceb2cac7c4c79fbc06b34ed281008fd38ba3a2e27b7288beba95c31c8642407f7dd6ac0160f588bee
EBUILD libffado-2.2.1.ebuild 2154 SHA256 9600223a859ff36bc43b43d3387a94ec1699235852d1ce675e832b795bfa41aa SHA512 b531cefdfb3a4f3c7ad4d664e17fb33143893b3d362f1b3957640ca820e9b3cbe9be265f082a6cd1cc9a847c24e4fcdc6dcbbf39fe5bb441904b4fd7aecc3490 WHIRLPOOL 71c088f84a13bed9274ff8e9e53c713cb9c11ce2f0c36567d07749985fa778f40f30b2dba0d353c1f0680c6c9eff59ccbcdcd4cecdb34e59ae30bf7404b1f787
-EBUILD libffado-9999.ebuild 2100 SHA256 54d5922ed77e22505617d2bb98d307c43bc28f6e5b3a65c05564cbdc0ddbbfd0 SHA512 ab184441823a1bee6698c8beaf2861a8b6fbeb3cfcf3ecbd459f0aefc4a1022f6cd7b32fb94be5d3d5437ff61632103dd807d9fbb66110e893231da4cf7562dd WHIRLPOOL fc0e6feeecbdbab4393f8a17380a13f638b7cf8f8acab2ef201401e89f2a33936c6f02bec18a9757c932dab198e0d5224b3ed02372f957aa0c5a11db99cddb91
-MISC ChangeLog 5426 SHA256 0b57d4f3516f7fd21fb40ff5021da082148e22c67dfcb901b9f83b8abbce9fcf SHA512 30cfaf108ba5b27c54ec06cb168b0c59b92ead88b58c308053ca5409f11be5e869aa67b8b3c4f78de5898a6d1740df57fc7fc29fdbd5b2ac7cccd644a7cc8aae WHIRLPOOL 7b1300779f20513be364b86b5d96080172b2cec558747f4002a17cac873c56cb7d1fcbb511ccb0bc91fc5b4ae9d9634fe6cc2aaa5b6265b74bcde1d184a49b67
+EBUILD libffado-9999.ebuild 2215 SHA256 727e5cac1a9bffca66e8986b86b14d4310faca67f3dbe884be87c8ef80d15f0c SHA512 060140507a62a2adbbd7f36c1057e29858c62af72c35fe6255788e57830448d90c655407f8cf1ee8f3e0b6ab309303e2b292cc0d5d654eca4ddbf6b4a1a7996c WHIRLPOOL 1b5f239a8a64363217e13de18d65f4ebe676d90023b47f20ace4c72458adf8b830d74b22044c94318dc6e4fa9fabd5585d6d3e4e1e3ee8c343f8f43c51dc46ea
+MISC ChangeLog 5737 SHA256 ed8ffbebdf1e4b79bf70829dc08af6db01c760a81faaf7bbcd02c815f92829ea SHA512 32ea441d6107e84b27d2b4474035dfb259089a80be86e87a2858912e88b97564ee2691063fa5406da658f24386905fb23e57845ca2a950a296b64303aaf5a5a9 WHIRLPOOL 09b8837bfea9e5dcc98eae94f73e0848a0c1f22c9cd0d23dd0ce6c4288673239e39b9743e523f527f6e824387765f7a758a52af51d991fce5ff08bff8f5b56ce
MISC metadata.xml 353 SHA256 608a4a6b28282ff02bda855731c407ccec16d907de90968b75241be123780a64 SHA512 f0399d9fbe3ffcd86066d1442c7a9dd178ac7601dea53280b6bd570bc5a839f4e63051b6bdd04d38c58a5edd6a39dac33af90b82bf46c633516d9ec3a5ee78b9 WHIRLPOOL a75323edc62d5cc245791c7d0cd56d16827d8f8778932c862684cbe59295821339ada5a3ed8a26de27a61f7f7c8ab0df8391efc4c42c608406314d9c579fad72
Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-mixer.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-mixer.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-mixer.patch 2015-03-26 20:17:40 UTC (rev 2924)
@@ -0,0 +1,102 @@
+# AUTHOR: Karl Linden (lilrc)
+# DESCRIPTION: Patch to remove the automagic dependency on PyQt and friends.
+# STATUS: Sent upstream as of 26 March 2015.
+# SEE: http://subversion.ffado.org/ticket/391
+
+Index: SConstruct
+===================================================================
+--- SConstruct (revision 2587)
++++ SConstruct (working copy)
+@@ -68,6 +68,7 @@
+ this code.""", False ),
+ BoolVariable( "ENABLE_ALL", "Enable/Disable support for all devices.", False ),
+ BoolVariable( "SERIALIZE_USE_EXPAT", "Use libexpat for XML serialization.", False ),
++ EnumVariable( "BUILD_MIXER", "Build the ffado-mixer", 'auto', allowed_values=('auto', 'true', 'false'), ignorecase=2),
+ BoolVariable( "BUILD_TESTS", """\
+ Build the tests in their directory. As some contain quite some functionality,
+ this is on by default.
+@@ -379,28 +380,33 @@
+ #
+
+ # PyQT checks
+-build_mixer = False
+-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
+- env['PYUIC4'] = True
+- build_mixer = True
++if env['BUILD_MIXER'] != 'false':
++ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
++ env['BUILD_MIXER'] = 'true'
++ elif not env.GetOption('clean'):
++ if env['BUILD_MIXER'] == 'auto':
++ env['BUILD_MIXER'] = 'false'
++ print """
++The prerequisites ('pyuic4' and the python-modules 'dbus' and 'PyQt4', the
++packages could be named like dbus-python and PyQt) to build the mixer were not
++found. Therefore the qt4 mixer will not be installed."""
++ else: # env['BUILD_MIXER'] == 'true'
++ print """
++The prerequisites ('pyuic4' and the python-modules 'dbus' and 'PyQt4', the
++packages could be named like dbus-python and PyQt) to build the mixer were not
++found, but BUILD_MIXER was requested."""
++ Exit( 1 )
+
+-if conf.CheckForApp( 'xdg-desktop-menu --help' ):
+- env['XDG_TOOLS'] = True
+-else:
+- print """
+-I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource
+-this is needed to add the fancy entry to your menu. But if the mixer will be
+-installed, you can start it by executing "ffado-mixer".
+-"""
++env['XDG_TOOLS'] = False
++if env['BUILD_MIXER'] == 'true':
++ if conf.CheckForApp( 'xdg-desktop-menu --help' ) and conf.CheckForApp( 'xdg-icon-resource --help' ):
++ env['XDG_TOOLS'] = True
++ else:
++ print """
++I couldn't find the 'xdg-desktop-menu' and 'xdg-icon-resource' programs. These
++are needed to add the fancy entry for the mixer to your menu, but you can still
++start it by executing "ffado-mixer"."""
+
+-if not build_mixer and not env.GetOption('clean'):
+- print """
+-I couldn't find all the prerequisites ('pyuic4' and the python-modules 'dbus'
+-and 'PyQt4', the packages could be named like dbus-python and PyQt) to build the
+-mixer.
+-Therefor the qt4 mixer will not get installed.
+-"""
+-
+ #
+ # Optional pkg-config
+ #
+@@ -510,7 +516,7 @@
+ env.Alias( "install", env['sharedir'] )
+ env.Alias( "install", env['bindir'] )
+ env.Alias( "install", env['mandir'] )
+-if build_mixer:
++if env['BUILD_MIXER'] == 'true':
+ env.Alias( "install", env['pypkgdir'] )
+
+ #
+@@ -909,7 +915,7 @@
+ if env.GetOption( "clean" ):
+ env.Execute( action )
+
+- if env.has_key( 'XDG_TOOLS' ) and env.has_key( 'PYUIC4' ):
++ if env['BUILD_MIXER'] == 'true' and env['XDG_TOOLS']:
+ if not env.GetOption("clean"):
+ action = "install"
+ else:
+Index: support/mixer-qt4/SConscript
+===================================================================
+--- support/mixer-qt4/SConscript (revision 2587)
++++ support/mixer-qt4/SConscript (working copy)
+@@ -26,7 +26,7 @@
+
+ Import( 'env' )
+
+-if env.has_key('PYUIC4'):
++if env['BUILD_MIXER'] == 'true':
+ e = env.Clone()
+
+ def findfiles( arg, dirname, names ):
Copied: trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r2.ebuild (from rev 2923, trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r1.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r2.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r2.ebuild 2015-03-26 20:17:40 UTC (rev 2924)
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 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 eutils multilib python-single-r1 scons-utils toolchain-funcs udev
+
+DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
+HOMEPAGE="http://www.ffado.org";
+
+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"
+SLOT="0"
+IUSE="debug qt4 +test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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[dbus,${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ x11-misc/xdg-utils
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-jack-detect.patch
+ "${FILESDIR}"/${P}-detect-userspace-env.patch
+ "${FILESDIR}"/${P}-mixer.patch
+)
+
+src_unpack() {
+ if [ "${PV}" = "9999" ]; then
+ subversion_src_unpack
+ else
+ default
+ fi
+}
+
+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"
+ CUSTOM_ENV=True
+ DETECT_USERSPACE_ENV=False
+ $(use_scons debug DEBUG)
+ $(use_scons qt4 BUILD_MIXER true false)
+ $(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-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild 2015-03-22 07:25:38 UTC (rev 2923)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild 2015-03-26 20:17:40 UTC (rev 2924)
@@ -39,12 +39,17 @@
qt4? (
dev-python/PyQt4[dbus,${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
+ x11-misc/xdg-utils
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
DOCS=( AUTHORS ChangeLog README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.1-mixer.patch
+)
+
src_unpack() {
if [ "${PV}" = "9999" ]; then
subversion_src_unpack
@@ -67,6 +72,7 @@
CUSTOM_ENV=True
DETECT_USERSPACE_ENV=False
$(use_scons debug DEBUG)
+ $(use_scons qt4 BUILD_MIXER true false)
$(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.