summary refs log tree commit diff
path: root/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
diff options
context:
space:
mode:
authorCillian de Róiste <goibhniu@fsfe.org>2012-09-30 21:23:28 +0200
committerCillian de Róiste <goibhniu@fsfe.org>2012-09-30 21:23:28 +0200
commit564cc7d12c68f0678b49b5892e4406adedefda1c (patch)
tree3f1d91342d3a0cbc7be7a0b2be9e55b8b19566a2 /pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
parent35cc2c32bbb1d9f5f06c57f06435f052424a1d56 (diff)
downloadnixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.tar
nixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.tar.gz
nixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.tar.bz2
nixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.tar.lz
nixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.tar.xz
nixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.tar.zst
nixpkgs-564cc7d12c68f0678b49b5892e4406adedefda1c.zip
Upgrade ffado (FireWire audio drivers) to the recently released 2.1.0
Diffstat (limited to 'pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch')
-rw-r--r--pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
index 44c0b991e0a..480e0f45a92 100644
--- a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
+++ b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
@@ -1,24 +1,25 @@
---- libffado-r2117/SConstruct	1970-01-01 01:00:01.000000000 +0100
-+++ libffado-r2117/SConstruct	2012-04-06 18:26:45.521100690 +0200
-@@ -314,10 +314,8 @@
+--- libffado-2.1.0/SConstruct	1970-01-01 01:00:01.000000000 +0100
++++ libffado-2.1.0/SConstruct	2012-09-30 16:50:23.603283095 +0000
+@@ -349,11 +349,9 @@
+ # Optional checks follow:
  #
  
- # PyQT checks
+-# 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
 +env['PYUIC4'] = True
 +build_mixer = True
++
  
  if conf.CheckForApp( 'xdg-desktop-menu --help' ):
      env['XDG_TOOLS'] = True
-@@ -348,7 +346,8 @@
+@@ -384,7 +382,7 @@
      name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
      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 False:
      env['DBUS1_FLAGS'] = ""
      env['DBUSC1_FLAGS'] = ""