dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Upgrade ffado (FireWire audio drivers) to the recently released 2.1.0

Browse Source
This commit is contained in:
Cillian de Róiste 2012-09-30 21:23:28 +02:00
parent 35cc2c32bb
commit 564cc7d12c
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/linux/ffado/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig { stdenv, fetchurl, dbus, dbus_cplusplus, expat, glibmm, libconfig
, libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig , libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig
, pyqt4, python, pythonDBus, qt4, scons }: , pyqt4, python, pythonDBus, qt4, scons }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libffado-svn-1995"; name = "libffado-${version}";
version = "2.1.0";
src = fetchsvn { src = fetchurl {
url = "http://subversion.ffado.org/ffado/trunk/libffado"; url = "http://www.ffado.org/files/${name}.tgz";
rev = "1995"; sha256 = "11cxmy31c19720j2171l735rpg7l8i41icsgqscfd2vkbscfmh6y";
}; };
buildInputs = buildInputs =
@ -18,13 +19,16 @@ stdenv.mkDerivation rec {
patches = [ ./enable-mixer-and-dbus.patch ]; patches = [ ./enable-mixer-and-dbus.patch ];
preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages";
# TODO fix ffado-diag, it doesn't seem to use PYPKGDIR # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX"; buildPhase = ''
export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages
scons PYPKGDIR=$out/$PYLIBSUFFIX
sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py
'';
installPhase = '' installPhase = ''
scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \ scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
PYPKGDIR=$out/$PYLIBSUFFIX install PYPKGDIR=$out/$PYLIBSUFFIX UDEVDIR=$out/lib/udev/rules.d install
sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag

13
pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
View File

@ -1,24 +1,25 @@
--- libffado-r2117/SConstruct 1970-01-01 01:00:01.000000000 +0100 --- libffado-2.1.0/SConstruct 1970-01-01 01:00:01.000000000 +0100
+++ libffado-r2117/SConstruct 2012-04-06 18:26:45.521100690 +0200 +++ libffado-2.1.0/SConstruct 2012-09-30 16:50:23.603283095 +0000
@@ -314,10 +314,8 @@ @@ -349,11 +349,9 @@
# Optional checks follow:
# #
# PyQT checks -# PyQT checks
-build_mixer = False -build_mixer = False
-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): -if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
- env['PYUIC4'] = True - env['PYUIC4'] = True
- build_mixer = True - build_mixer = True
+env['PYUIC4'] = True +env['PYUIC4'] = True
+build_mixer = True +build_mixer = True
+
if conf.CheckForApp( 'xdg-desktop-menu --help' ): if conf.CheckForApp( 'xdg-desktop-menu --help' ):
env['XDG_TOOLS'] = True env['XDG_TOOLS'] = True
@@ -348,7 +346,8 @@ @@ -384,7 +382,7 @@
name2 = pkg.replace("+","").replace(".","").replace("-","").upper() name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] ) env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
-if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'): -if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'):
+
+if False: +if False:
env['DBUS1_FLAGS'] = "" env['DBUS1_FLAGS'] = ""
env['DBUSC1_FLAGS'] = "" env['DBUSC1_FLAGS'] = ""