[SM-Commit] GIT changes to master grimoire by Florian Franzmann (e768b99cff91498e664c4f185f527e0849e26259)

Florian Franzmann scm at sourcemage.org
Sat Mar 3 15:32:29 EST 2012


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

 kde4-support/phonon-backend-gstreamer/BUILD           |    9 +--------
 kde4-support/phonon-backend-gstreamer/DETAILS         |    7 +++----
 kde4-support/phonon-backend-gstreamer/HISTORY         |    5 +++++
 kde4-support/phonon-backend-gstreamer/PRE_BUILD       |    3 ---
 kde4-support/phonon-backend-gstreamer/message.h.patch |   11 -----------
 kde4-support/phonon-backend-vlc/DETAILS               |    9 ++++-----
 kde4-support/phonon-backend-vlc/HISTORY               |    3 +++
 kde4-support/phonon/HISTORY                           |    3 +++
 kde4-support/phonon/INSTALL                           |    2 ++
 9 files changed, 21 insertions(+), 31 deletions(-)

New commits:
commit e768b99cff91498e664c4f185f527e0849e26259
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    kde4-support/phonon-backend-vlc: version 0.5.0

commit bb7ee62792c9c2a6dc8373680a02535086eea4ee
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    kde4-support/phonon-backend-gstreamer: version 4.6.0

commit 2513ce604bac9af744eecd48be03837620f7d470
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    kde4-support/phonon: create symlink so backends are found

diff --git a/kde4-support/phonon-backend-gstreamer/BUILD b/kde4-support/phonon-backend-gstreamer/BUILD
index e6cc973..2113434 100755
--- a/kde4-support/phonon-backend-gstreamer/BUILD
+++ b/kde4-support/phonon-backend-gstreamer/BUILD
@@ -1,8 +1 @@
-QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
-PATH="$QTDIR:$PATH"   &&
-cd $SOURCE_DIRECTORY  &&
-mkdir -p build        &&
-cd build              &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS $SOURCE_DIRECTORY &&
-make
-
+qt4_cmake_build
diff --git a/kde4-support/phonon-backend-gstreamer/DETAILS b/kde4-support/phonon-backend-gstreamer/DETAILS
index 0bceadd..04607fb 100755
--- a/kde4-support/phonon-backend-gstreamer/DETAILS
+++ b/kde4-support/phonon-backend-gstreamer/DETAILS
@@ -1,8 +1,7 @@
            SPELL=phonon-backend-gstreamer
-         VERSION=4.4.4
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:4393147c683a7002149f9490d9a08dd26aae44a02c12a009238061bfae2b9d9c10407fe0efc9ecf95ae5fadbb25f649a5bf9bbe556611cc94530f2dada03e733
-          SOURCE=$SPELL-$VERSION.tar.bz2
+         VERSION=4.6.0
+     SOURCE_HASH=sha512:38e117d5d4db698af5e750a104de7e3a49fe5498cfdde3bec57f8773addff66d7179a423eaadc9f4821c6595b7f4321f758c593c41328593367ce21dc3d6dbf3
+          SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://phonon.kde.org/
diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY b/kde4-support/phonon-backend-gstreamer/HISTORY
index ce0626f..b4d06bd 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,8 @@
+2012-03-03 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 4.6.0
+	* PRE_BUILD, message.h.patch: removed
+	* BUILD: use qt4_cmake_build instead of reimplementing it
+
 2012-01-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, message.h.patch: fixed compile error with current
 	  versions of glib2
diff --git a/kde4-support/phonon-backend-gstreamer/PRE_BUILD b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
deleted file mode 100755
index b2a0a0f..0000000
--- a/kde4-support/phonon-backend-gstreamer/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/message.h.patch
diff --git a/kde4-support/phonon-backend-gstreamer/message.h.patch b/kde4-support/phonon-backend-gstreamer/message.h.patch
deleted file mode 100644
index a6ab7cf..0000000
--- a/kde4-support/phonon-backend-gstreamer/message.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- phonon-backend-gstreamer-4.4.4/gstreamer/message.h.orig	2012-01-15 15:11:10.270718918 +0100
-+++ phonon-backend-gstreamer-4.4.4/gstreamer/message.h	2012-01-15 15:11:21.532577144 +0100
-@@ -20,7 +20,7 @@
- 
- #include <QtCore/QMetaType>
- 
--#include <glib-2.0/glib/gmacros.h> // For G_*_DECLS macros primarily
-+#include <glib.h> // For G_*_DECLS macros primarily
- #include <gst/gstmessage.h>
- 
- QT_BEGIN_NAMESPACE
diff --git a/kde4-support/phonon-backend-vlc/DETAILS b/kde4-support/phonon-backend-vlc/DETAILS
index cf3482e..4a96e61 100755
--- a/kde4-support/phonon-backend-vlc/DETAILS
+++ b/kde4-support/phonon-backend-vlc/DETAILS
@@ -1,9 +1,8 @@
            SPELL=phonon-backend-vlc
-         VERSION=0.4.1
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:01b81596298c0b60838ffd13fbe330d79c4952b5dbc2733dbd200456ecf90f055fbf459f7c51ac90c3f4d9dbe7545a0d70fccc6d556ebdef0156838d57f82568
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/$SOURCE
+         VERSION=0.5.0
+     SOURCE_HASH=sha512:5b324dea3c981a7244313855c2aec762dd18b31e54793ed4f629dbf4173742cba8b73ddb3085fcc83f9377d805d3ef6f1632cc9324d973facb572f642420482a
+          SOURCE=$SPELL-$VERSION.tar.xz
+   SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://phonon.kde.org/
       LICENSE[0]=LGPL
diff --git a/kde4-support/phonon-backend-vlc/HISTORY b/kde4-support/phonon-backend-vlc/HISTORY
index c46b719..78b52d3 100644
--- a/kde4-support/phonon-backend-vlc/HISTORY
+++ b/kde4-support/phonon-backend-vlc/HISTORY
@@ -1,3 +1,6 @@
+2012-03-03 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.5.0
+
 2011-09-04 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change
 
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index 5d400f9..e42d35f 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,6 @@
+2012-03-03 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* INSTALL: create symlink so backends are found
+
 2012-02-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.6.0
 
diff --git a/kde4-support/phonon/INSTALL b/kde4-support/phonon/INSTALL
new file mode 100755
index 0000000..9451097
--- /dev/null
+++ b/kde4-support/phonon/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -sf /usr/lib/kde4/plugins/phonon_backend ${INSTALL_ROOT}/usr/lib/qt4/plugins/phonon_backend


More information about the SM-Commit mailing list