diff --git a/.gitignore b/.gitignore index d9af863..5076f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.1.0-svn2000.tar.bz2 /libffado-2.1.0-svn2088.tar.bz2 /libffado-2.1.0.tgz +/libffado-2.2.1.tgz diff --git a/libffado-2.1.0-udev-rules.patch b/libffado-2.1.0-udev-rules.patch deleted file mode 100644 index 8e37c16..0000000 --- a/libffado-2.1.0-udev-rules.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- libffado/60-ffado.rules -+++ libffado/60-ffado.rules -@@ -1,35 +1,58 @@ - SUBSYSTEM!="firewire", GOTO="ffado_end" - --ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S --ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. (aka MOTU) --ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. --ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation --ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG --ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation --ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH --ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio --ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. --ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. --ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. --ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited --ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation --ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" # Phonic Corporation --ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH --ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems --ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. --ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION --ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" # DnR -+# TC GROUP A/S -+ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" -+# Mark of the Unicorn, Inc. (aka MOTU) -+ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" -+# Apogee Electronics Corp. -+ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" -+# Alesis Corporation -+ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" -+# Bridgeco Co AG -+ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" -+# Presonus Corporation -+ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" -+# TerraTec Electronic GmbH -+ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" -+# M-Audio -+ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" -+# Ego Systems Inc. -+ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" -+# Loud Technologies Inc. -+ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" -+# Stanton Magnetics,inc. -+ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" -+# Focusrite Audio Engineering Limited -+ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" -+# Echo Digital Audio Corporation -+ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" -+# Phonic Corporation -+ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" -+# BEHRINGER Spezielle Studiotechnik GmbH -+ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" -+# FlexRadio Systems -+ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" -+# Weiss Engineering Ltd. -+ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" -+# ROLAND DG CORPORATION -+ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" -+# DnR -+ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" - - # The devices below are by vendors who make other firewire devices in - # addition to their audio interfaces. They need more specific rules to - # ensure only audio interfaces are covered here. - --ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" # Tascam, a subsiduary of TEAC (the OUI is TEAC's) -+# Tascam, a subsiduary of TEAC (the OUI is TEAC's) -+ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" - - # The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. - --ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW --ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire --ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME -+# CME, Matrix K FW -+ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" -+# Mackie, Onyx Firewire -+ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" -+# RME -+ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" - - LABEL="ffado_end" diff --git a/libffado.spec b/libffado.spec index 120539f..eeeb9a4 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.1.0 -Release: 4%{?dist} +Version: 2.2.1 +Release: 1%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -15,7 +15,6 @@ Source9: libffado-snapshot.sh # We want the documentation for the library API only, not for the entire source: # http://subversion.ffado.org/ticket/293 Patch0: libffado-api-doc-only.patch -Patch1: libffado-2.1.0-udev-rules.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel BuildRequires: dbus-devel @@ -69,7 +68,6 @@ Applications and utilities for use with libffado. %prep %setup -q %patch0 -p1 -b .api.doc.only -%patch1 -p0 -b .udev.rules # We don't want to install all tests sed -i '/Install/d' tests/{,*/}SConscript @@ -140,6 +138,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jun 01 2014 Brendan Jones 2.2.1-1 +- Update to 2.2.1 +- Remove incorporated udev rules patch + * Mon Sep 30 2013 Brendan Jones 2.1.0-4 - Corrrect udev rules RFBZ#999580 - Correct changelog diff --git a/sources b/sources index 2dadc7c..345518b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26bce2be0b9c1fa4e614f2f494edf388 libffado-2.1.0.tgz +e113d828835051f835fb4a329cb0cbd4 libffado-2.2.1.tgz