diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | README.RUS | 5 | ||||
| -rw-r--r-- | src/plugins/Input/opus/CMakeLists.txt | 6 |
4 files changed, 12 insertions, 6 deletions
@@ -127,7 +127,7 @@ Licq - an instant messaging client for UNIX (C) 2006-2009 Licq developers -TagLib - a library for reading and editing the meta-data of several popular audio formats (C) 2002-2012 +TagLib - audio meta-data library (C) 2002-2012 Lukáš Lalinský <wheeler@kde.org> Scott Wheeler <wheeler@kde.org> @@ -11,6 +11,7 @@ Supported operating systems: Supported formats: - MPEG1 layer 2/3 - Ogg Vorbis +- Ogg Opus - Native FLAC, Ogg FLAC - Musepack - WavePack @@ -87,6 +88,8 @@ Requirements: - libcddb >= 1.3.1 (Optional) - faad2 >= 2.6.1 (Optional) - game-music-emu >= 0.5.5 (Optional) +- opus >= 1.0.2 (Optional) +- opusfile >= 0.2 (Optional) - libWildMidi >= 0.2.3.4 (Optional) - libbs2b >= 3.0.0 (Optional) - libprojectM >= 1.2.0 (Optional) @@ -113,7 +116,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE Available options: - USE_CURL, USE_MMS (transports); - USE_MAD, USE_FLAC, USE_VORBIS, USE_MPC, USE_MODPLUG, USE_SNDFILE, USE_WAVPACK, USE_FFMPEG, USE_AAC, USE_CUE, - USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME, USE_FFMPEG_LEGACY (decoders); + USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME, USE_FFMPEG_LEGACY, USE_OPUS (decoders); - USE_ALSA, USE_OSS, USE_JACK, USE_PULSE, USE_NULL, USE_OSS4, USE_WAVEOUT (output plugins); - USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO (effects); - USE_ANALYZER, USE_PROJECTM (visualization); diff --git a/README.RUS b/README.RUS index 2364689d2..02a5c1e0f 100644 --- a/README.RUS +++ b/README.RUS @@ -11,6 +11,7 @@ Qmmp - Qt-based multimedia player Поддерживаемые форматы: - MPEG1 layer 2/3 - Ogg Vorbis +- Ogg Opus - Native FLAC, Ogg FLAC - Musepack - WavePack @@ -86,6 +87,8 @@ Qmmp - Qt-based multimedia player - libcddb >= 1.3.1 (Опционально) - faad2 >= 2.6.1 (Опционально) - game-music-emu >= 0.5.5 (Опционально) +- opus >= 1.0.2 (Опционально) +- opusfile >= 0.2 (Опционально) - libWildMidi >= 0.2.3.4 (Опционально) - libbs2b >= 3.0.0 (Опционально) - libprojectM >= 1.2.0 (Опционально) @@ -110,7 +113,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE Доступные опции: - USE_CURL, USE_MMS (транспортные модули); - USE_MAD, USE_FLAC, USE_VORBIS, USE_MPC, USE_MODPLUG, USE_SNDFILE, USE_WAVPACK, USE_FFMPEG, USE_AAC, USE_CUE, - USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME, USE_FFMPEG_LEGACY (декодеры); + USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME, USE_FFMPEG_LEGACY, USE_OPUS (декодеры); - USE_ALSA, USE_OSS, USE_JACK, USE_PULSE, USE_NULL, USE_OSS4, USE_WAVEOUT (модули вывода); - USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO (эффекты); - USE_ANALYZER, USE_PROJECTM (визуализация); diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt index 6da145f96..a34b087b1 100644 --- a/src/plugins/Input/opus/CMakeLists.txt +++ b/src/plugins/Input/opus/CMakeLists.txt @@ -1,11 +1,11 @@ project(libopus) -cmake_minimum_required(VERSION 2.4.7) +cmake_minimum_required(VERSION 2.6.0) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) - + # qt plugin ADD_DEFINITIONS( -Wall ) ADD_DEFINITIONS(${QT_DEFINITIONS}) @@ -26,7 +26,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libopus and libopusfile -pkg_check_modules(OPUS opus opusfile) +pkg_check_modules(OPUS opus>=1.0.2 opusfile>=0.2) include_directories(${OPUS_INCLUDE_DIRS} ${TAGLIB_INCLUDE_DIRS}) link_directories(${OPUS_LIBRARY_DIRS} ${TAGLIB_LIBRARY_DIRS}) |