rpm/qmmp
SHA256
1
0
Fork 0
forked from pool/qmmp
Code Pull Requests Activity

Accepting request 123146 from multimedia:apps

Browse Source 
- Disable HAL plugin build
- Disable OSS plugin build
- Use PulseAudio by default instead of ALSA

- Fix build with ffmpeg 0.11

OBS-URL: https://build.opensuse.org/request/show/123146
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2012-06-01 20:32:10 +00:00 committed by Git OBS Bridge
commit 4569643ad8
4 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qmmp-0.5.5-default_pulse.patch Normal file
View File

@ -0,0 +1,13 @@
Index: src/qmmp/output.cpp
===================================================================
--- src/qmmp/output.cpp.orig
+++ src/qmmp/output.cpp
@@ -473,7 +473,7 @@ OutputFactory *Output::currentFactory()
checkFactories();
QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
#ifdef Q_OS_LINUX
- QString name = settings.value("Output/current_plugin", "alsa").toString();
+ QString name = settings.value("Output/current_plugin", "pulse").toString();
#else
QString name = settings.value("Output/current_plugin", "oss").toString();
#endif

14
qmmp-0.5.5-ffmpeg_011.patch Normal file
View File

@ -0,0 +1,14 @@
Index: src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
===================================================================
--- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp.orig
+++ src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -133,9 +133,6 @@ bool DecoderFFmpeg::initialize()
m_stream->seekable = !input()->isSequential();
m_stream->max_packet_size = INPUT_BUFFER_SIZE;
- AVFormatParameters ap;
- memset(&ap, 0, sizeof(ap));
-
if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0)
{
qDebug("DecoderFFmpeg: av_open_input_stream() failed");

12
qmmp.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu May 31 21:08:33 UTC 2012 - reddwarf@opensuse.org
- Disable HAL plugin build
- Disable OSS plugin build
- Use PulseAudio by default instead of ALSA
-------------------------------------------------------------------
Sun May 27 23:35:53 UTC 2012 - reddwarf@opensuse.org
- Fix build with ffmpeg 0.11
-------------------------------------------------------------------
Sat May 26 10:45:52 UTC 2012 - reddwarf@opensuse.org

10
qmmp.spec
View File

@ -31,6 +31,10 @@ Group: Productivity/Multimedia/Sound/Players
Url: http://qmmp.ylsoftware.com/
Source0: http://qmmp.googlecode.com/files/qmmp-%{version}.tar.bz2
Patch0: qmmp-0.5.5-libcdio_mess.patch
# Already in trunk
Patch1: qmmp-0.5.5-ffmpeg_011.patch
# PATCH-FEATURE-OPENSUSE qmmp-0.5.5-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default
Patch2: qmmp-0.5.5-default_pulse.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@ -116,6 +120,8 @@ Development files for libqmmp.
%prep
%setup -q
%patch0
%patch1
%patch2
%build
mkdir build
@ -123,8 +129,8 @@ cd build
export CFLAGS='%{optflags}'
export CXXFLAGS='%{optflags}'
cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_VERBOSE_MAKEFILE=TRUE ..
-DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release -DUSE_HAL=FALSE \
-DUSE_OSS=FALSE -DCMAKE_VERBOSE_MAKEFILE=TRUE ..
make %{?_smp_mflags}
%install