Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (e2d4c6d06b4adc9634088e1a57b5e482c0ccb33f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (e2d4c6d06b4adc9634088e1a57b5e482c0ccb33f)
  • Date: Sun, 29 Jul 2012 04:36:38 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

kde4-apps/ktorrent4/DEPENDS | 5 +++--
kde4-apps/ktorrent4/DETAILS | 4 ++--
kde4-apps/ktorrent4/HISTORY | 4 ++++
kde4/kdemultimedia4/DEPENDS | 2 +-
kde4/kdemultimedia4/HISTORY | 4 ++++
kde4/kdemultimedia4/PRE_BUILD | 12 +++++++-----
telephony/mediastreamer/HISTORY | 3 +++
telephony/mediastreamer/PRE_BUILD | 8 +++++---
8 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit e2d4c6d06b4adc9634088e1a57b5e482c0ccb33f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ktorrent4: => 4.2.1
* DEPENDS: added depends qca2

commit a41a08bb69ac24b0364a2ebf3e85334817bfc2e2
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

mediastreamer: apply ffmpeg patch for ffmpeg-svn as well

commit 2cdbb5d75a510bcde720d3cc95b199baff06b810
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kdemultimedia4: forgot to account for ffmpeg-svn
DEPENDS: ffmpeg -> LIBAVCODEC
PRE_BUILD: apply ffmpeg-0.11 patch for ffmpeg-svn as well

diff --git a/kde4-apps/ktorrent4/DEPENDS b/kde4-apps/ktorrent4/DEPENDS
index 98fe78b..8270ca5 100755
--- a/kde4-apps/ktorrent4/DEPENDS
+++ b/kde4-apps/ktorrent4/DEPENDS
@@ -1,6 +1,7 @@
. "$SECTION_DIRECTORY/KDE_DEPENDS" &&
depends boost &&
-depends kdepimlibs4 &&
+depends kdepimlibs4 &&
depends libktorrent &&
-depends taglib &&
+depends taglib &&
+depends qca2 &&
optional_depends avahi "" "" "to find peers on the local network"
diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index 683b143..5fdca24 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,6 +1,6 @@
SPELL=ktorrent4
- VERSION=4.1.3
-
SOURCE_HASH=sha512:930e09daca7168151763a9ac724b4679b7346e92432df8e7945612d328d44fc5750b24941f74e7c865f0315a31bb25d3406fcdfbe3af373283e71549ecd7a9b2
+ VERSION=4.2.1
+
SOURCE_HASH=sha512:933fac0f69d06bb4d2e4bf25ec716a0988d5f36b42399679672dd2a58648d4cc7ac547b41ad21dcb96c04e14a694f121d9f702c53ccb6fd2e02198c12570452e
# VX=4.0
SOURCE=${SPELL//4}-${VERSION}.tar.bz2
# SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 46643b9..587741e 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,7 @@
+2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.1
+ * DEPENDS: added depends qca2
+
2011-11-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.1.3

diff --git a/kde4/kdemultimedia4/DEPENDS b/kde4/kdemultimedia4/DEPENDS
index 756ed4e..19c8997 100755
--- a/kde4/kdemultimedia4/DEPENDS
+++ b/kde4/kdemultimedia4/DEPENDS
@@ -13,5 +13,5 @@ optional_depends taglib '' '' 'to build Juk and for
Strigi to process au
optional_depends cdparanoia '' '' 'to build cd ripper' &&
optional_depends libmusicbrainz '' '' 'for music metadata lookup' &&
optional_depends pulseaudio '' '' 'to allow KMix to control PulseAudio'
&&
-optional_depends ffmpeg '' '' 'for video preview backend' &&
+optional_depends LIBAVCODEC '' '' 'for video preview backend' &&
optional_depends doxygen '' '' 'to build documentation'
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index a72bd0a..d1ff1a7 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,7 @@
+2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: ffmpeg -> LIBAVCODEC
+ * PRE_BUILD: also apply patch if ffmpeg-svn is installed
+
2012-07-28 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 4.8.4
* DEPENDS: added optional_depends pulseaudio & ffmpeg
diff --git a/kde4/kdemultimedia4/PRE_BUILD b/kde4/kdemultimedia4/PRE_BUILD
index 87fdce3..3436c80 100755
--- a/kde4/kdemultimedia4/PRE_BUILD
+++ b/kde4/kdemultimedia4/PRE_BUILD
@@ -1,8 +1,10 @@
default_pre_build &&

-if spell_ok ffmpeg; then
- if (( $(installed_version ffmpeg|cut -d. -f2) >= 11 )); then
- cd $SOURCE_DIRECTORY/ffmpegthumbs &&
- patch -p1 < $SPELL_DIRECTORY/kdemultimedia-4.8.4-ffmpeg-0.11.patch
- fi
+FFMPEG_VER=0
+if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then
+ FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+fi
+if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+ cd $SOURCE_DIRECTORY/ffmpegthumbs &&
+ patch -p1 < $SPELL_DIRECTORY/kdemultimedia-4.8.4-ffmpeg-0.11.patch
fi
diff --git a/telephony/mediastreamer/HISTORY b/telephony/mediastreamer/HISTORY
index 266da3c..ce3581c 100644
--- a/telephony/mediastreamer/HISTORY
+++ b/telephony/mediastreamer/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply ffmpeg 0.11 patch for ffmpeg-svn as well
+
2012-07-28 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 2.8.2
* PREPARE: added, to query for video support
diff --git a/telephony/mediastreamer/PRE_BUILD
b/telephony/mediastreamer/PRE_BUILD
index d27057d..880fd5e 100755
--- a/telephony/mediastreamer/PRE_BUILD
+++ b/telephony/mediastreamer/PRE_BUILD
@@ -1,8 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+FFMPEG_VER=0
if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then
- if (( $(installed_version ffmpeg|cut -d. -f2) >= 11 )); then
- patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch
- fi
+ FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+fi
+if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+ patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (e2d4c6d06b4adc9634088e1a57b5e482c0ccb33f), Sukneet Basuta, 07/29/2012

Archive powered by MHonArc 2.6.24.

Top of Page