Commit 319b3097 authored by Phil's avatar Phil
Browse files

phonon-backend-mplayer: try to fix amarok crash

parent c9bc863f
......@@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=('phonon-backend-mplayer')
_pkgname=('phonon-mplayer')
pkgver=20120212
pkgrel=2
pkgrel=3
pkgdesc='Phonon MPlayer backend'
arch=('i686' 'x86_64')
url='http://phonon.kde.org'
......@@ -20,8 +20,8 @@ makedepends=('qt' 'pkgconfig' 'cmake' 'automoc4' 'git' 'mesa')
groups=("kde-complete" "kde-uninstall")
conflicts=("phonon-mplayer-svn" 'phonon-mplayer')
replaces=("phonon-mplayer-svn" 'phonon-mplayer')
source=(http://chakra-linux.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz)
md5sums=(3e4334033ff7930a9b2a55a8b46fc9db)
source=(http://chakra-linux.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz find-config.patch)
md5sums=(3e4334033ff7930a9b2a55a8b46fc9db 55a20d7146371fbf1f1139a2ed874604)
# create tarball: source PKGBUILD && mksource
......@@ -37,6 +37,7 @@ mksource() {
build() {
cd "$srcdir/${pkgname}-${pkgver}"
patch -Np1 -i ${srcdir}/find-config.patch
msg "Starting make..."
......@@ -45,9 +46,13 @@ build() {
# Build
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DPLUGIN_INSTALL_DIR=/usr/lib/kde4 -DSERVICES_INSTALL_DIR=/usr/share/kde4/services . || return 1
make || return 1
make DESTDIR=${pkgdir} install || return 1
-DPLUGIN_INSTALL_DIR=/usr/lib/kde4 -DSERVICES_INSTALL_DIR=/usr/share/kde4/services .
make
}
package() {
cd "$srcdir/${pkgname}-${pkgver}"
make DESTDIR=${pkgdir} install
rm -rf "${srcdir}/${_gitname}-build"
}
diff -aur phonon-mplayer/mplayer/libmplayer/MPlayerConfig.cpp phonon-mplayer2/mplayer/libmplayer/MPlayerConfig.cpp
--- phonon-mplayer/mplayer/libmplayer/MPlayerConfig.cpp 2011-11-24 18:06:31.105227140 -0800
+++ phonon-mplayer2/mplayer/libmplayer/MPlayerConfig.cpp 2011-11-24 18:17:02.000000000 -0800
@@ -73,7 +73,7 @@
//Under Windows, config file should be inside a subdirectory named mplayer/mplayer
QString defaultMPlayerConfigPath = "mplayer/mplayer/config";
#else
- QString defaultMPlayerConfigPath = "~/.mplayer/config";
+ QString defaultMPlayerConfigPath = QDir::homePath()+"/.mplayer/config";
#endif
return _settings.value("mplayer_config_path", defaultMPlayerConfigPath).toString();
diff -aur phonon-mplayer/mplayer/libmplayer/MPlayerConfig.h phonon-mplayer2/mplayer/libmplayer/MPlayerConfig.h
--- phonon-mplayer/mplayer/libmplayer/MPlayerConfig.h 2011-11-24 18:06:31.105227140 -0800
+++ phonon-mplayer2/mplayer/libmplayer/MPlayerConfig.h 2011-11-24 18:18:05.000000000 -0800
@@ -21,6 +21,7 @@
#include <QtCore/QString>
#include <QtCore/QSettings>
+#include <QtCore/QDir>
namespace Phonon
{
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment