[SM-Commit] GIT changes to master grimoire by George Sherwood (2fe11885a313b2e092765843281f8031863fe4f4)

Ladislav Hagara ladislav.hagara at unob.cz
Mon Oct 9 04:48:26 EDT 2006


> GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:
>
>  audio-players/moc/BUILD             |    3 +++
>  audio-players/moc/DEPENDS           |    9 ++++++---
>  audio-players/moc/DETAILS           |    8 +++++---
>  audio-players/moc/DamianPietras.gpg |binary
>  audio-players/moc/HISTORY           |    6 ++++++
>  5 files changed, 20 insertions(+), 6 deletions(-)
>
> New commits:
> commit 2fe11885a313b2e092765843281f8031863fe4f4
> Author: George Sherwood <chat at sourcemage.org>
> Commit: George Sherwood <chat at sourcemage.org>
>
>     Updated moc to version 2.4.0 and SOURCE_GPG.  Added changes from Bug
>
> diff --git a/audio-players/moc/BUILD b/audio-players/moc/BUILD
> index c4da7ef..2576412 100755
> --- a/audio-players/moc/BUILD
> +++ b/audio-players/moc/BUILD
> @@ -1,3 +1,6 @@
> +#breaks the compile
> +OPTS="--without-ncursesw $OPTS" &&
> +
>  if [ "$DDEBUG" == "y" ]; then
>    OPTS="$OPTS  --disable-debug"
>  fi &&
> diff --git a/audio-players/moc/DEPENDS b/audio-players/moc/DEPENDS
> index efe26b1..927656e 100755
> --- a/audio-players/moc/DEPENDS
> +++ b/audio-players/moc/DEPENDS
> @@ -31,9 +31,13 @@ optional_depends  flac \
>  optional_depends  libsndfile \
>                    "" \
>                    "--without-sndfile --disable-libFLACtest" \
> -                  "for sndfile support" &&
> +                  "for sndfile support (WAVE, AU, AIFF, SVX, SPH, IRC, VOC)" &&
> +
> +optional_depends  ffmpeg-cvs  \
> +                  "" \
> +                  "--without-ffmpeg" \
> +                  "for ffmpeg support (WMA, realAudio, AAC, MP4)" &&
>  
> -if [ $DEV = "y" ]; then
>  optional_depends  speex \
>                    "" \
>                    "--without-speex" \
> @@ -48,4 +52,3 @@ optional_depends  curl \
>                    "" \
>                    "--without-curl" \
>                    "for curl (Internet streams support) support"
> -fi
> diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
> index 0f0023e..1b36d14 100755
> --- a/audio-players/moc/DETAILS
> +++ b/audio-players/moc/DETAILS
> @@ -6,17 +6,19 @@ if [ "$DEV" == "y" ]; then
>       SOURCE_HASH=sha512:862639c711734e967ae22446cb698f106d4c8a40fcb815a0fe47bd2fc2eb1ee32039ac31de307e8c448a15ed1cd7d8f769f898e72f0d8c43fd3f299b3da3e4cb:UPSTREAM_HASH
>  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-DEVEL
>  else
> -         VERSION=2.3.2
> +         VERSION=2.4.0
>            SOURCE=$SPELL-$VERSION.tar.bz2
>     SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE
> -     SOURCE_HASH=sha512:ceb44fd784d4e9887cfdca5d0b23a6b674a3c33c78185c797bb63b2116187629f6ce283c6aded90e83c86b6c0502af360fca29b1127f0239ad7e30506c121f3c:UPSTREAM_HASH
> +      SOURCE_GPG="DamianPietras.gpg:${SOURCE}.sig"
>  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
>  fi
> +         SOURCE2=${SOURCE}.sig
> +     SOURCE2_URL=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE2
> +  SOURCE2_IGNORE=signature
>          WEB_SITE=http://moc.daper.net/
>           ENTERED=20050706
>        LICENSE[0]=GPLv2
>          KEYWORDS="music players player audio"
> -       BUILD_API=1
>             SHORT="MOC (music on console) is a console audio player"
>  cat << EOF
>  MOC (music on console) is a console audio player for LINUX/UNIX designed 
> diff --git a/audio-players/moc/DamianPietras.gpg b/audio-players/moc/DamianPietras.gpg
> new file mode 100644
> index 0000000..b5cd7df
> Binary files /dev/null and b/audio-players/moc/DamianPietras.gpg differ
> diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
> index 3276f42..7dd0e47 100644
> --- a/audio-players/moc/HISTORY
> +++ b/audio-players/moc/HISTORY
> @@ -1,3 +1,9 @@
> +2006-10-08 George Sherwood <george at beernabeer.com>
> +	* DETAILS: Updated to 2.4.0 and SOURCE_GPG. Removed BUILD_API=1
> +	* BUILD: Added option to disable UTF8 support. Wouldn't build
> +	* DEPENDS: Added various depends from Bug #10376
> +	* DamianPietras.gpg: Added upstream sig
> +
>  2006-10-06 Juuso Alasuutari <iuso at sourcemage.org>
>  	* DEPENDS: Changed jack to JACK-DRIVER.
>  


Found source file moc-2.4.0.tar.bz2 for spell moc in /var/spool/sorcery
Found source file moc-2.4.0.tar.bz2.sig for spell moc in /var/spool/sorcery
Waiting for any  Solo casts to complete...
Waiting for any other casts of  moc  to complete... done.
Building moc
GPG checking source file moc-2.4.0.tar.bz2...
Algorithm used: sha1
Allowing new hashsha1
Checking spell level WORKS_FOR_ME
Spell level is a new allowed level
gpg signature verified!
Unpacking source file moc-2.4.0.tar.bz2 for spell moc.
patching file interface.c
Hunk #1 FAILED at 2992.
Hunk #2 FAILED at 3003.
Hunk #3 FAILED at 3016.
3 out of 3 hunks FAILED -- saving rejects to file interface.c.rej
patching file menu.c
Hunk #1 FAILED at 421.
1 out of 1 hunk FAILED -- saving rejects to file menu.c.rej

Spells that encountered problems:
---------------------------------
moc



-- 
Ladislav Hagara



More information about the SM-Commit mailing list