Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7a365fb68fbaa8e2bf3ac65834f023f33c793c0f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7a365fb68fbaa8e2bf3ac65834f023f33c793c0f)
  • Date: Mon, 20 Aug 2012 05:49:43 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +
kde4-support/phonon-backend-mplayer/BUILD | 1
kde4-support/phonon-backend-mplayer/DEPENDS | 4 ++
kde4-support/phonon-backend-mplayer/DETAILS | 17 ++++++++++
kde4-support/phonon-backend-mplayer/HISTORY | 4 ++
kde4-support/phonon-backend-mplayer/PREPARE | 2 +
kde4-support/phonon-backend-mplayer/PRE_BUILD | 3 +
kde4-support/phonon-backend-mplayer/fix_find_config.patch | 23
++++++++++++++
8 files changed, 57 insertions(+)

New commits:
commit 41ca422e349301e49465a688ebddc90f59a36eb0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kde4-support/phonon-backend-mplayer: new spell, mplayer phonon backend

diff --git a/ChangeLog b/ChangeLog
index 095bfaa..5a1bf8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * kde4-support/phonon-backend-mplayer: new spell, mplayer backend for
phonon
+
2012-08-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* latex/latex-mk: new spell, a build system for latex documents

diff --git a/kde4-support/phonon-backend-mplayer/BUILD
b/kde4-support/phonon-backend-mplayer/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/kde4-support/phonon-backend-mplayer/DEPENDS
b/kde4-support/phonon-backend-mplayer/DEPENDS
new file mode 100755
index 0000000..1d7a44f
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/DEPENDS
@@ -0,0 +1,4 @@
+depends phonon &&
+depends qt4 &&
+depends -sub CXX gcc &&
+depends mplayer
diff --git a/kde4-support/phonon-backend-mplayer/DETAILS
b/kde4-support/phonon-backend-mplayer/DETAILS
new file mode 100755
index 0000000..03a0c7e
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=phonon-backend-mplayer
+ if [[ "$PHONON_BACKEND_MPLAYER_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE="${SPELL}-git.tar.bz2"
+ SOURCE_URL[0]=git_http://anongit.kde.org/phonon-mplayer:${SPELL}-git
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+
WEB_SITE="https://projects.kde.org/projects/kdesupport/phonon/phonon-mplayer";
+ LICENSE[0]=GPL
+ ENTERED=20120820
+ SHORT="MPlayer backend for the Phonon multimedia library"
+cat << EOF
+A MPlayer backend for the Phonon multimedia library.
+EOF
diff --git a/kde4-support/phonon-backend-mplayer/HISTORY
b/kde4-support/phonon-backend-mplayer/HISTORY
new file mode 100644
index 0000000..da2337e
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/HISTORY
@@ -0,0 +1,4 @@
+2012-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, fix_find_config.patch, PRE_BUILD,
+ PREPARE: spell created. fix_find_config.patch is from archlinux
+
diff --git a/kde4-support/phonon-backend-mplayer/PREPARE
b/kde4-support/phonon-backend-mplayer/PREPARE
new file mode 100755
index 0000000..3ca45ba
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch scm
diff --git a/kde4-support/phonon-backend-mplayer/PRE_BUILD
b/kde4-support/phonon-backend-mplayer/PRE_BUILD
new file mode 100755
index 0000000..89ffe0b
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/fix_find_config.patch
diff --git a/kde4-support/phonon-backend-mplayer/fix_find_config.patch
b/kde4-support/phonon-backend-mplayer/fix_find_config.patch
new file mode 100644
index 0000000..1455386
--- /dev/null
+++ b/kde4-support/phonon-backend-mplayer/fix_find_config.patch
@@ -0,0 +1,23 @@
+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
+ {



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7a365fb68fbaa8e2bf3ac65834f023f33c793c0f), Florian Franzmann, 08/20/2012

Archive powered by MHonArc 2.6.24.

Top of Page