← Back to branch summary

~ubuntu-branches/ubuntu/wily/libffado/wily

~ubuntu-branches/ubuntu/wily/libffado/wily

« back to all changes in this revision

Viewing changes to src/SConscript

Committer: Package Import Robot
Author(s): Artem Popov
Date: 2013-01-26 14:55:38 UTC
mfrom: (8.1.11 experimental)
Revision ID: package-import@ubuntu.com-20130126145538-4we9vsu1ra1d7mgh

Tags: 2.1.0+svn2240-1ubuntu1

https://launchpad.net/bugs/1105818

* Merge with Debian (LP: #1105818); remaining changes:
- Build using dh_python2

files added:
src/dice/focusrite/saffire_pro14.cpp

src/dice/focusrite/saffire_pro14.h

support/tools/ffado-set-nickname.cpp

files removed:
.pc/downgrade_to_r2166.patch

.pc/downgrade_to_r2166.patch/src

.pc/downgrade_to_r2166.patch/src/bebob

.pc/downgrade_to_r2166.patch/src/bebob/bebob_dl_mgr.cpp

.pc/downgrade_to_r2166.patch/src/debugmodule

.pc/downgrade_to_r2166.patch/src/debugmodule/debugmodule.cpp

.pc/downgrade_to_r2166.patch/src/libieee1394

.pc/downgrade_to_r2166.patch/src/libieee1394/IsoHandlerManager.cpp

.pc/downgrade_to_r2166.patch/src/libieee1394/ieee1394service.cpp

.pc/downgrade_to_r2166.patch/src/libieee1394/ieee1394service.h

.pc/downgrade_to_r2166.patch/src/libstreaming

.pc/downgrade_to_r2166.patch/src/libstreaming/StreamProcessorManager.cpp

.pc/downgrade_to_r2166.patch/src/libutil

.pc/downgrade_to_r2166.patch/src/libutil/PosixMessageQueue.cpp

.pc/downgrade_to_r2166.patch/src/libutil/SystemTimeSource.cpp

.pc/downgrade_to_r2166.patch/src/libutil/SystemTimeSource.h

.pc/downgrade_to_r2166.patch/src/motu

.pc/downgrade_to_r2166.patch/src/motu/motu_avdevice.cpp

.pc/downgrade_to_r2166.patch/src/rme

.pc/downgrade_to_r2166.patch/src/rme/fireface_hw.cpp

.pc/downgrade_to_r2166.patch/src/rme/rme_avdevice.cpp

.pc/fix_ftbfs_bigendian.patch

.pc/fix_ftbfs_bigendian.patch/src

.pc/fix_ftbfs_bigendian.patch/src/rme

.pc/fix_ftbfs_bigendian.patch/src/rme/rme_avdevice.cpp

debian/patches

debian/patches/downgrade_to_r2166.patch

debian/patches/fix_ftbfs_bigendian.patch

debian/patches/series

src/libutil/cycles.h

files modified:
.pc/applied-patches

AUTHORS

SConstruct

configuration

debian/changelog

libffado/60-ffado.rules

src/SConscript

src/bebob/bebob_dl_mgr.cpp

src/debugmodule/debugmodule.cpp

src/dice/dice_avdevice.cpp

src/dice/dice_avdevice.h

src/dice/dice_eap.cpp

src/dice/dice_firmware_loader.cpp

src/dice/focusrite/saffire_pro24.cpp

src/dice/focusrite/saffire_pro24.h

src/dice/focusrite/saffire_pro40.cpp

src/dice/focusrite/saffire_pro40.h

src/libieee1394/CycleTimerHelper.cpp

src/libieee1394/IsoHandlerManager.cpp

src/libieee1394/configrom.cpp

src/libieee1394/ieee1394service.cpp

src/libieee1394/ieee1394service.h

src/libieee1394/vendor_model_ids.h

src/libstreaming/StreamProcessorManager.cpp

src/libstreaming/rme/RmeTransmitStreamProcessor.cpp

src/libutil/PosixMessageQueue.cpp

src/libutil/SystemTimeSource.cpp

src/libutil/SystemTimeSource.h

src/motu/motu_avdevice.cpp

src/motu/motu_avdevice.h

src/motu/motu_mixer.cpp

src/motu/motu_mixerdefs.cpp

src/motu/motu_mixerdefs.h

src/rme/fireface_flash.cpp

src/rme/fireface_hw.cpp

src/rme/rme_avdevice_settings.cpp

support/mixer-qt4/ffado/mixer/globalmixer.py

support/mixer-qt4/ffado/mixer/motu.py

support/mixer-qt4/ffado/mixer/motu.ui

support/tools/SConscript

Show diffs side-by-side

added added

removed removed

165

165

dice/focusrite/focusrite_eap.cpp \

166

166

dice/focusrite/saffire_pro40.cpp \

167

167

dice/focusrite/saffire_pro24.cpp \

168

dice/focusrite/saffire_pro14.cpp \

168

169

' )

169

170

170

171

bounce_source = env.Split( '\

Older »