Skip to Content.
Sympa Menu

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

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 (b5adbf7f44b2ec2212c61d315949db5f5b0ba0fe)
  • Date: Sat, 28 Jul 2012 22:27:22 -0500

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

kde4/kdemultimedia4/DEPENDS | 27
+++++++------
kde4/kdemultimedia4/DETAILS | 4 +-
kde4/kdemultimedia4/HISTORY | 7 +++
kde4/kdemultimedia4/PRE_BUILD | 8 ++++
kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch | 28
++++++++++++++
5 files changed, 60 insertions(+), 14 deletions(-)

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

kdemultimedia4: => 4.8.4
* DEPENDS: added optional_depends pulseaudio & ffmpeg
fixed up optional_depend descriptions
* PRE_BUILD: added to apply patch if ffmpeg >= 0.11 is installed
* kdemultimedia-4.8.4-ffmpeg-0.11.patch: added, to remove deprecated
functions

diff --git a/kde4/kdemultimedia4/DEPENDS b/kde4/kdemultimedia4/DEPENDS
index 06835a3..756ed4e 100755
--- a/kde4/kdemultimedia4/DEPENDS
+++ b/kde4/kdemultimedia4/DEPENDS
@@ -1,14 +1,17 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS &&
-optional_depends alsa-lib '' '' 'sound support' &&
-optional_depends libogg '' '' 'play Ogg files' &&
-optional_depends libvorbis '' '' 'play Vorbis files' &&
-optional_depends libtheora '' '' 'video codec' &&
-optional_depends xine-lib '' '' 'video playback' &&
-optional_depends flac '' '' 'lossless audio codec' &&
-optional_depends libtunepimp '' '' 'MusicBrainz tagging' &&
-optional_depends taglib '' '' 'process audio meta data' &&
-#optional_depends nmm '' '' 'Phonon-NMM backend' &&
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+optional_depends alsa-lib '' '' 'for ALSA sound support' &&
+optional_depends libogg '' '' 'to play Ogg files' &&
+optional_depends libvorbis '' '' 'to play Vorbis files' &&
+optional_depends libtheora '' '' 'to play Theora video files' &&
+optional_depends xine-lib '' '' 'for video playback' &&
+optional_depends flac '' '' 'to play FLAC files' &&
+optional_depends libtunepimp '' '' 'for MusicBrainz tagging' &&
+optional_depends taglib '' '' 'to build Juk and for Strigi to
process audio meta data' &&
+#optional_depends nmm '' '' 'Phonon-NMM backend' &&
# http://www.networkmultimedia.org

-optional_depends cdparanoia '' '' 'cd ripper'
-optional_depends libmusicbrainz '' '' 'download music metadata'
+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 doxygen '' '' 'to build documentation'
diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index b21cab3..01f9724 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdemultimedia4
SPELLX=${SPELL//4}
- VERSION=4.8.3
-
SOURCE_HASH=sha512:34dcbb98387d6a16ed9f6abe9070246bad9c92f6d6de2cd02a9e7b34e3272c80acb18c5d6c091f096aa62aa94e7c23d549b5fa8c805dc194270817875e619476
+ VERSION=4.8.4
+
SOURCE_HASH=sha512:2696788ebb4cbf28cd2cf6b128d5f482cc1b47f6ce6c0c83e27369f17164f0793dec7d5d5714fd2d8af879f6e0c57a60386e73e5b334c5a215753db5301350d9
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index 1ff2bc2..a72bd0a 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,10 @@
+2012-07-28 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.4
+ * DEPENDS: added optional_depends pulseaudio & ffmpeg
+ fixed up optional_depend descriptions
+ * PRE_BUILD: added to apply patch if ffmpeg >= 0.11 is installed
+ * kdemultimedia-4.8.4-ffmpeg-0.11.patch: added, to remove deprecated
functions
+
2012-05-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.8.3, bz2 -> xz

diff --git a/kde4/kdemultimedia4/PRE_BUILD b/kde4/kdemultimedia4/PRE_BUILD
new file mode 100755
index 0000000..87fdce3
--- /dev/null
+++ b/kde4/kdemultimedia4/PRE_BUILD
@@ -0,0 +1,8 @@
+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
+fi
diff --git a/kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch
b/kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch
new file mode 100644
index 0000000..d31c355
--- /dev/null
+++ b/kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch
@@ -0,0 +1,28 @@
+From: Christoph Feck <christoph AT maxiom.de>
+Date: Tue, 29 May 2012 13:53:18 +0000
+Subject: Two deprecated calls have been removed from ffmpeg 0.11.
+X-Git-Tag: v4.8.80
+X-Git-Url:
http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
+---
+Two deprecated calls have been removed from ffmpeg 0.11.
+
+BUG:300732
+---
+
+
+--- a/ffmpegthumbnailer/moviedecoder.cpp
++++ b/ffmpegthumbnailer/moviedecoder.cpp
+@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
+ void MovieDecoder::initialize(const QString& filename)
+ {
+ av_register_all();
+- avcodec_init();
+ avcodec_register_all();
+
+ QFileInfo fileInfo(filename);
+
+- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext,
fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
++ if ((!m_FormatContextWasGiven) &&
avformat_open_input(&m_pFormatContext,
fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
+ kDebug() << "Could not open input file: " <<
fileInfo.absoluteFilePath();
+ return;
+ }



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

Archive powered by MHonArc 2.6.24.

Top of Page