| [proaudio] [1402] libffado updates: |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1402
Author: gimpel
Date: 2008-12-19 13:37:03 +0100 (Fri, 19 Dec 2008)
Log Message:
-----------
libffado updates:
* libffado-2.0_rc1: apply patch from trunk to find dbus.mainloop.qt py module
* rename useflag mixer -> qt4
* allow qt < 4.4
* merge optimization useflag with debug
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libffado/Manifest
trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild
trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/libffado/files/
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mailoop.patch
Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest 2008-12-18 00:12:37 UTC (rev 1401)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest 2008-12-19 12:37:03 UTC (rev 1402)
@@ -1,5 +1,6 @@
+AUX libffado-2.0_rc1-dbus_mailoop.patch 1010 RMD160 04f150c1d9eba2b638ac87c4560b8d4572f8277a SHA1 1abbc4187d1931695c2eccf13f84d26d19f272f0 SHA256 8870c12392750f8af373d3b048747cdce51c909b03ade12e107010c2558320d0
DIST libffado-2.0-rc1.tar.gz 765589 RMD160 2ada5e508e61e940c37ccdb85372323cba5cc975 SHA1 891507b71f7c654d0af9c87036e22877291eab40 SHA256 76dae9c5e342d5496513c203f2625a549ad58467fc353be75e6a5ff5f66f1817
-EBUILD libffado-2.0_rc1.ebuild 1096 RMD160 855822423c735a236d933a84bc26c48d2c7b075f SHA1 5aeb0578749e970e9803d464428cb46bfa68a5fa SHA256 eaddf2e7f24e656a0b287c095581db73b5410c72a11939f26e2347baa4e11c1e
-EBUILD libffado-9999.ebuild 1025 RMD160 f23837d18f2fe59845056fa936698c52e41c2d7e SHA1 4c036be80b7d0ffe93202550a7c65829e4828d36 SHA256 313184f37071f9fb56e9b95b1aea8b88c777d154e91504f8dcaeb99999c0d439
-MISC ChangeLog 365 RMD160 8ce5a0a6e7a616660f22d91d1dafea51e854013b SHA1 5b76bb717bdd74c40a1a2f9df2faae253f0d80f8 SHA256 bfef0a667c2d22ff0fb76c41fc1b5bfb47d6143f9286aaaca7a0ba0d7aa3090b
+EBUILD libffado-2.0_rc1.ebuild 1444 RMD160 afa94ec19cccce21cd80c5fa5aef1a98d283fd2d SHA1 a000fc8b687c0536f984f3d399dad91d05ceb485 SHA256 b8514a0a14b1089636998980afbe4bb505ee1c2fa75f3d4269de1c24557b81fe
+EBUILD libffado-9999.ebuild 1318 RMD160 90763a676af27e5e0d89fae6339cbbbaf3278329 SHA1 bc2c9efb06f03fa262f813952d09327d5310f81c SHA256 848a203769d150b66e990282d8e449bbf520be459592e98460e29b4cb401dd71
+MISC ChangeLog 709 RMD160 cfc0368ec948168f0c9ecc0149a043e57d711a6f SHA1 abbf68eb3b94fade2d770aa99193e77ae9ade064 SHA256 2bac6f551a9b83403d65a1366bb857bb8d7e77d981af74bed7528780f1c99254
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mailoop.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mailoop.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mailoop.patch 2008-12-19 12:37:03 UTC (rev 1402)
@@ -0,0 +1,31 @@
+Index: /branches/libffado-2.0/SConstruct
+===================================================================
+--- /branches/libffado-2.0/SConstruct (revision 1473)
++++ /branches/libffado-2.0/SConstruct (revision 1476)
+@@ -153,23 +153,7 @@
+ def CheckForPyModule( context, module ):
+ context.Message( "Checking for the python module '" + module + "' " )
+- ret = True
+- path = None
+- while module.count(".") > 0 and ret:
+- thismod = module.split(".")[0]
+- try:
+- modinfo = imp.find_module( thismod, path )
+- except ImportError:
+- ret = False
+- else:
+- newmod = imp.load_module( thismod, modinfo[0], modinfo[1], modinfo[2] )
+- path = newmod.__path__
+- module = ".".join( module.split(".")[1:] )
+- if ret:
+- try:
+- imp.find_module( module )
+- except ImportError:
+- ret = False
+- context.Result( ret )
+- return ret
++ ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
++ context.Result( ret[0] )
++ return ret[0]
+
+ def CompilerCheck( context ):
Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild 2008-12-18 00:12:37 UTC (rev 1401)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild 2008-12-19 12:37:03 UTC (rev 1402)
@@ -2,8 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit multilib
+EAPI=1
+inherit eutils multilib
+
MY_P="${P/_/-}"
DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
@@ -13,7 +15,7 @@
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="debug mixer optimization"
+IUSE="debug qt4"
RDEPEND=">=media-libs/alsa-lib-1.0.0
>=dev-cpp/libxmlpp-2.13.0
@@ -21,29 +23,43 @@
>=media-libs/libiec61883-1.1.0
>=sys-libs/libavc1394-0.5.3
>=sys-apps/dbus-1.0
- mixer? ( x11-libs/qt-core
- x11-libs/qt-gui
- dev-python/PyQt4
- >=dev-python/dbus-python-0.83.0 )"
+ qt4? (
+ || ( ( x11-libs/qt-core x11-libs/qt-gui )
+ >=x11-libs/qt-4.0:4 )
+ dev-python/PyQt4
+ >=dev-python/dbus-python-0.83.0 )"
DEPEND="${RDEPEND}
dev-util/scons"
S="${WORKDIR}/${MY_P}"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ # http://subversion.ffado.org/ticket/171
+ epatch "${FILESDIR}/${P}-dbus_mailoop.patch"
+}
+
src_compile () {
- local myconf="PREFIX=/usr LIBDIR=/usr/$(get_libdir)"
+ local myconf=""
use debug \
- && myconf="${myconf} DEBUG=True" \
- || myconf="${myconf} DEBUG=False"
+ && myconf="${myconf} DEBUG=True ENABLE_OPTIMIZATIONS=False" \
+ || myconf="${myconf} DEBUG=False ENABLE_OPTIMIZATIONS=True"
- use optimization && myconf="${myconf} ENABLE_OPTIMIZATIONS=True"
-
- scons ${myconf} || die
+ scons \
+ PREFIX=/usr \
+ LIBDIR=/usr/$(get_libdir) \
+ ${myconf} || die
}
src_install () {
- scons DESTDIR="${D}" install || die
+ scons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install || die
dodoc AUTHORS ChangeLog NEWS README TODO
+
+ 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 2008-12-18 00:12:37 UTC (rev 1401)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild 2008-12-19 12:37:03 UTC (rev 1402)
@@ -2,18 +2,21 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit subversion exteutils
+EAPI=1
-IUSE="debug profile"
+inherit eutils multilib subversion
+MY_P="${P/_/-}"
+
DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
HOMEPAGE="http://www.ffado.org";
+
ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk";
-
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
+IUSE="debug qt4"
RDEPEND=">=media-libs/alsa-lib-1.0.0
>=dev-cpp/libxmlpp-2.13.0
@@ -21,27 +24,36 @@
>=media-libs/libiec61883-1.1.0
>=sys-libs/libavc1394-0.5.3
>=sys-apps/dbus-1.0
- =media-sound/jack-audio-connection-kit-9999"
+ qt4? (
+ || ( ( x11-libs/qt-core x11-libs/qt-gui )
+ >=x11-libs/qt-4.0:4 )
+ dev-python/PyQt4
+ >=dev-python/dbus-python-0.83.0 )"
DEPEND="${RDEPEND}
dev-util/scons"
+S="${WORKDIR}/${MY_P}"
+
src_compile () {
- cd "$PN"
- escons \
- $(scons_use_enable debug DEBUG) \
- $(scons_use_enable profile PROFILE) \
- CFLAGS="${CFLAGS}" \
- PREFIX="/usr/"
+ local myconf=""
+
+ use debug \
+ && myconf="${myconf} DEBUG=True ENABLE_OPTIMIZATIONS=False" \
+ || myconf="${myconf} DEBUG=False ENABLE_OPTIMIZATIONS=True"
+
+ scons \
+ PREFIX=/usr \
+ LIBDIR=/usr/$(get_libdir) \
+ ${myconf} || die
}
src_install () {
- cd "$PN"
- escons DESTDIR="${D}" install || die
+ scons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install || die
dodoc AUTHORS ChangeLog NEWS README TODO
-}
-pkg_postinst() {
- elog "If jack won't work with libffado. You have to"
- elog "re-emerge jack-audio-connection-kit"
+ if use qt4; then
+ newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+ newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+ fi
}