Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://code.google.com/p/clementine-player into grooveshark

This commit is contained in:
Arnaud Bienner 2011-09-13 22:27:10 +02:00
parent 09c288a506 58dae530f2
commit b8d5068624
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/clementine.spec.in vendored
View File

@ -13,9 +13,9 @@ BuildRequires: desktop-file-utils liblastfm-devel taglib-devel gettext
BuildRequires: qt4-devel boost-devel gcc-c++ glew-devel libgpod-devel
BuildRequires: cmake gstreamer-devel gstreamer-plugins-base-devel
BuildRequires: libimobiledevice-devel libplist-devel usbmuxd-devel
BuildRequires: libmtp-devel
BuildRequires: libmtp-devel protobuf-devel protobuf-compiler libcdio-devel
Requires: libgpod
Requires: libgpod protobuf-lite libcdio
# GStreamer codec dependencies
Requires: gstreamer-plugins-ugly

5
src/devices/macdevicelister.mm
View File

@ -472,8 +472,9 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
device.bus = -1;
device.address = -1;
if (device.vendor_id == 0x5ac) {
// I think we can safely skip Apple products.
if (device.vendor_id == 0x5ac || // I think we can safely skip Apple products.
// Blacklist ilok2 as this probe may be breaking it.
(device.vendor_id == 0x088e && device.product_id == 0x5036)) {
continue;
}