Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (4a5ee4638e3e4b5dc8a32edacdc617b8a574d0d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (4a5ee4638e3e4b5dc8a32edacdc617b8a574d0d1)
  • Date: Tue, 24 Feb 2009 14:35:56 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

audio-players/moc/HISTORY | 4 ++++
audio-players/moc/PRE_BUILD | 2 --
audio-players/moc/ffmpeg.patch | 23 -----------------------
3 files changed, 4 insertions(+), 25 deletions(-)

New commits:
commit 4a5ee4638e3e4b5dc8a32edacdc617b8a574d0d1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

moc: Removed patch incorporated upstream. Appears they changed the
source and didn't version bump. No integrity failure since we are using
their key and sig. Bug 15087.

diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index 6158385..6a1139d 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,7 @@
+2009-02-24 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Removed. Bug #15087
+ * ffmpeg.patch: Removed. Fixed upstream without version bump.
+
2009-01-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* ffmpeg.patch: fix the include path #14349 (by Javier)
* DEPENDS: changed ffmpeg-svn to LIBAVCODEC
diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD
deleted file mode 100755
index ed8a1e0..0000000
--- a/audio-players/moc/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/ffmpeg.patch
diff --git a/audio-players/moc/ffmpeg.patch b/audio-players/moc/ffmpeg.patch
deleted file mode 100644
index 1226e4b..0000000
--- a/audio-players/moc/ffmpeg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 George Sherwood (4a5ee4638e3e4b5dc8a32edacdc617b8a574d0d1), George Sherwood, 02/24/2009

Archive powered by MHonArc 2.6.24.

Top of Page