Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7fe79b2723271fe741fae15010695364312c6279)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7fe79b2723271fe741fae15010695364312c6279)
  • Date: Sat, 24 Mar 2012 05:55:10 -0500

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

audio-players/moc/CONFIGURE | 1 -
audio-players/moc/DEPENDS | 36 +++++++++++++++++++++++++++++++++---
audio-players/moc/DETAILS | 23 ++++++++---------------
audio-players/moc/HISTORY | 8 ++++++++
audio-players/moc/PREPARE | 1 +
audio-players/moc/PRE_BUILD | 6 ++----
audio-players/moc/ffmpeg-10.patch | 34 ----------------------------------
7 files changed, 52 insertions(+), 57 deletions(-)

New commits:
commit 7fe79b2723271fe741fae15010695364312c6279
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/moc: switched to subversion since the stable as well as
the unstable upstream version segfault with our version of ffmpeg

diff --git a/audio-players/moc/CONFIGURE b/audio-players/moc/CONFIGURE
index df97afd..e453af8 100755
--- a/audio-players/moc/CONFIGURE
+++ b/audio-players/moc/CONFIGURE
@@ -1,2 +1 @@
-config_query DEV "Download development version?" n
config_query DDEBUG "Disable debug code?" y
diff --git a/audio-players/moc/DEPENDS b/audio-players/moc/DEPENDS
index 2e1a748..ae94488 100755
--- a/audio-players/moc/DEPENDS
+++ b/audio-players/moc/DEPENDS
@@ -1,6 +1,6 @@
-depends ncurses &&
+depends autoconf &&
+depends ncurses &&
depends libid3tag &&
-depends libmad &&

optional_depends alsa-lib \
"" \
@@ -22,11 +22,21 @@ optional_depends libogg \
"--without-ogg" \
"for ogg/vorbis support" &&

+optional_depends faad2 \
+ "" \
+ "--without-aac" \
+ "for AAC support" &&
+
optional_depends flac \
"" \
"--without-flac" \
"for flac support" &&

+optional_depends libmad \
+ "" \
+ "--without-mp3" \
+ "for MP3 support" &&
+
optional_depends libsndfile \
"" \
"--without-sndfile --disable-libFLACtest" \
@@ -37,6 +47,16 @@ optional_depends LIBAVCODEC \
"--without-ffmpeg" \
"for ffmpeg support (WMA, realAudio, AAC, MP4)" &&

+optional_depends libmodplug \
+ "" \
+ "--without-modplug" \
+ "for MOD support" &&
+
+optional_depends sidplay-libs \
+ "" \
+ "--without-sidplay2" \
+ "for c64 SID support" &&
+
optional_depends speex \
"" \
"--without-speex" \
@@ -47,7 +67,17 @@ optional_depends libsamplerate \
"--without-samplerate" \
"for Sample Rate Converter support" &&

+optional_depends timidity \
+ "" \
+ "--without-timidity" \
+ "for MIDI support" &&
+
optional_depends curl \
"" \
"--without-curl" \
- "for curl (Internet streams support) support"
+ "for curl (Internet streams support) support" &&
+
+optional_depends wavpack \
+ "" \
+ "--without-wavpack" \
+ "for WavPack support" \
diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
index 6b80810..e9e24be 100755
--- a/audio-players/moc/DETAILS
+++ b/audio-players/moc/DETAILS
@@ -1,21 +1,14 @@
SPELL=moc
-if [ "$DEV" == "y" ]; then
- VERSION=2.5.0-alpha4
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sig
- SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/$SOURCE2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-DEVEL
+if [[ "$MOC_SVN_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ FORCE_DOWNLOAD=on
else
- VERSION=2.4.4
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sig
- SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE2
+ VERSION=svn
fi
- SOURCE_GPG="DamianPietras.gpg:$SOURCE.sig:UPSTREAM_KEY"
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE=${SPELL}-svn.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+ SOURCE_URL[0]=svn://daper.net/moc/trunk:moc
+ SOURCE_IGNORE=volatile
WEB_SITE=http://moc.daper.net/
ENTERED=20050706
LICENSE[0]=GPLv2
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index ece0c87..af78b2e 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,11 @@
+2012-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, PREPARE, CONFIGURE: switched to subversion
since the
+ stable as well as the unstable upstream version are very old and
segfault
+ with our version of ffmpeg
+ * DEPENDS: made the dependency on libmad optional, added optional
+ dependencies on faad2, libmodplug, sidplay-libs, timidity and
wavpack
+ * PRE_BUILD, ffmpeg-10.patch: removed patch
+
2012-03-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, ffmpeg-10.patch: fixed build error with ffmpeg 10

diff --git a/audio-players/moc/PREPARE b/audio-players/moc/PREPARE
new file mode 100755
index 0000000..1da4eee
--- /dev/null
+++ b/audio-players/moc/PREPARE
@@ -0,0 +1 @@
+config_query MOC_SVN_AUTOUPDATE "Automatically update ${SPELL} on
system-update?" n
diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD
index 6f62cdf..68264d1 100755
--- a/audio-players/moc/PRE_BUILD
+++ b/audio-players/moc/PRE_BUILD
@@ -1,5 +1,3 @@
-default_pre_build &&
+default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ "$DEV" == "y" ]]; then
- patch -p2 < ${SCRIPT_DIRECTORY}/ffmpeg-10.patch
-fi
+autoreconf -fi
diff --git a/audio-players/moc/ffmpeg-10.patch
b/audio-players/moc/ffmpeg-10.patch
deleted file mode 100644
index c18841d..0000000
--- a/audio-players/moc/ffmpeg-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/moc/decoder_plugins/ffmpeg/ffmpeg.c
-+++ b/moc/decoder_plugins/ffmpeg/ffmpeg.c
-@@ -86,14 +86,14 @@ static void ffmpeg_info (const char *file_name,
- }
-
- if (tags_sel & TAGS_COMMENTS) {
-- if (ic->track != 0)
-- info->track = ic->track;
-- if (ic->title[0] != 0)
-- info->title = xstrdup (ic->title);
-- if (ic->author[0] != 0)
-- info->artist = xstrdup (ic->author);
-- if (ic->album[0] != 0)
-- info->album = xstrdup (ic->album);
-+ if (av_metadata_get(ic->metadata, "track", NULL, 0) != NULL)
-+ info->track = atoi(av_metadata_get(ic->metadata,
"track", NULL, 0)->value);
-+ if (av_metadata_get(ic->metadata, "title", NULL, 0) != NULL)
-+ info->title = xstrdup (av_metadata_get(ic->metadata,
"titke", NULL, 0)->value);
-+ if (av_metadata_get(ic->metadata, "author", NULL, 0) != NULL)
-+ info->artist = xstrdup (av_metadata_get(ic->metadata,
"author", NULL, 0)->value);
-+ if (av_metadata_get(ic->metadata, "album", NULL, 0) != NULL)
-+ info->album = xstrdup (av_metadata_get(ic->metadata,
"album", NULL, 0)->value);
- }
-
- if (tags_sel & TAGS_TIME)
-@@ -132,7 +132,7 @@ static void *ffmpeg_open (const char *file)
- av_read_play (data->ic);
- for (i = 0; i < data->ic->nb_streams; i++) {
- data->enc = data->ic->streams[i]->codec;
-- if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- audio_index = i;
- break;
- }



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7fe79b2723271fe741fae15010695364312c6279), Florian Franzmann, 03/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page