Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f664eabb0be55d6c7fe35e4ba78d14047d893d0a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f664eabb0be55d6c7fe35e4ba78d14047d893d0a)
  • Date: Wed, 7 Jan 2009 14:09:49 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

audio-players/moc/DEPENDS | 2 +-
audio-players/moc/HISTORY | 4 ++++
audio-players/moc/ffmpeg.patch | 23 +++++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit f664eabb0be55d6c7fe35e4ba78d14047d893d0a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

moc: fix the include path #14349 (by Javier)

commit a2aab519913973e6d5dc63ee28d1c179ceac2bd1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

moc: changed ffmpeg-svn to LIBAVCODEC

diff --git a/audio-players/moc/DEPENDS b/audio-players/moc/DEPENDS
index bf6f1ae..2e1a748 100755
--- a/audio-players/moc/DEPENDS
+++ b/audio-players/moc/DEPENDS
@@ -32,7 +32,7 @@ optional_depends libsndfile \
"--without-sndfile --disable-libFLACtest" \
"for sndfile support (WAVE, AU, AIFF, SVX, SPH, IRC, VOC)"
&&

-optional_depends ffmpeg-svn \
+optional_depends LIBAVCODEC \
"" \
"--without-ffmpeg" \
"for ffmpeg support (WMA, realAudio, AAC, MP4)" &&
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index e50af98..6158385 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,7 @@
+2009-01-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * ffmpeg.patch: fix the include path #14349 (by Javier)
+ * DEPENDS: changed ffmpeg-svn to LIBAVCODEC
+
2009-01-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.4 & 2.5.0-alpha3

diff --git a/audio-players/moc/ffmpeg.patch b/audio-players/moc/ffmpeg.patch
new file mode 100644
index 0000000..1226e4b
--- /dev/null
+++ b/audio-players/moc/ffmpeg.patch
@@ -0,0 +1,23 @@
+diff -Naur moc-2.4.3.orig/configure moc-2.4.3/configure
+--- moc-2.4.3.orig/configure 2008-03-12 20:01:40.000000000 -0600
++++ moc-2.4.3/configure 2008-03-12 20:42:11.000000000 -0600
+@@ -29013,6 +29013,7 @@
+ fi
+
+
++ libavformat_CFLAGS='-I/usr/include/ffmpeg'
+ if test "x$FFMPEG_CONFIG" = "xyes"
+ then
+ libavformat_CFLAGAS=`ffmpeg-config --cflags`
+diff -Naur moc-2.4.3.orig/decoder_plugins/ffmpeg/ffmpeg.c
moc-2.4.3/decoder_plugins/ffmpeg/ffmpeg.c
+--- moc-2.4.3.orig/decoder_plugins/ffmpeg/ffmpeg.c 2008-03-12
20:01:40.000000000 -0600
++++ moc-2.4.3/decoder_plugins/ffmpeg/ffmpeg.c 2008-03-12 20:10:43.000000000
-0600
+@@ -22,7 +22,7 @@
+ #ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+
+ /* FFmpeg also likes common names, without that, our common.h and log.h
would
+ * not be included. */



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f664eabb0be55d6c7fe35e4ba78d14047d893d0a), Jaka Kranjc, 01/07/2009

Archive powered by MHonArc 2.6.24.

Top of Page