diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-06 13:14:34 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-06 13:14:34 +0100 |
| commit | 367a7215c9b12d60d54a29863b0083fe7fcc8967 (patch) | |
| tree | f6dc19789e63cc21f9edb8bbd2f0eb94ba038cb3 | |
| parent | 75c61241ed8a6792bbc246696b412960d1a155ca (diff) | |
update to latest beta upstream version
| -rw-r--r-- | package/moc/Makefile | 6 | ||||
| -rw-r--r-- | package/moc/patches/patch-configure | 12 | ||||
| -rw-r--r-- | package/moc/patches/patch-options_c | 11 |
3 files changed, 20 insertions, 9 deletions
diff --git a/package/moc/Makefile b/package/moc/Makefile index 3aa1a16f7..77cd7cf7c 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= moc -PKG_VERSION:= 2.4.4 +PKG_VERSION:= 2.5.0-alpha4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 647c770a5542a4ae5437386807a89796 +PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0 PKG_DESCR:= console music player PKG_SECTION:= sound PKG_DEPENDS:= libmad libvorbis libcurl libflac ffmpeg libiconv @@ -14,7 +14,7 @@ PKG_DEPENDS+= libncurses libid3tag PKG_BUILDDEP+= ncurses libvorbis curl libmad flac ffmpeg libiconv PKG_BUILDDEP+= libid3tag PKG_URL:= http://moc.daper.net -PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/stable/ +PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure index 0968574d6..2330e0f4c 100644 --- a/package/moc/patches/patch-configure +++ b/package/moc/patches/patch-configure @@ -1,6 +1,6 @@ ---- moc-2.4.4.orig/configure 2009-01-04 09:28:51.000000000 +0100 -+++ moc-2.4.4/configure 2010-02-06 01:22:38.464334671 +0100 -@@ -13910,7 +13910,7 @@ DECODER_PLUGIN_DIR=decoder_plugins +--- moc-2.5.0-alpha4.orig/configure 2009-09-25 10:54:41.000000000 +0200 ++++ moc-2.5.0-alpha4/configure 2010-03-06 11:37:45.867276809 +0100 +@@ -17669,7 +17669,7 @@ DECODER_PLUGIN_DIR=decoder_plugins PLUGIN_LDFLAGS='-module -avoid-version' @@ -9,12 +9,12 @@ case "$OS" in Linux) -@@ -13929,7 +13929,7 @@ _ACEOF +@@ -17688,7 +17688,7 @@ _ACEOF ;; esac -LDFLAGS="$LDFLAGS -export-dynamic" +LDFLAGS="$LDFLAGS" - { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 - echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c new file mode 100644 index 000000000..b5e9ca676 --- /dev/null +++ b/package/moc/patches/patch-options_c @@ -0,0 +1,11 @@ +--- moc-2.5.0-alpha4.orig/options.c 2009-09-16 12:04:53.000000000 +0200 ++++ moc-2.5.0-alpha4/options.c 2010-03-06 11:38:50.596035001 +0100 +@@ -327,7 +327,7 @@ static void option_add_symb (const char + char *val = va_arg (va, char *); + if (strlen (val) == 0 || + strlen (val) != strspn (val, valid) || +- index (first, val[0]) != NULL) ++ strchr (first, val[0]) != NULL) + fatal ("Invalid symbol in '%s' constraint list.", name); + ((char **) options[pos].constraints)[ix] = xstrdup (val); + if (!strcasecmp (val, value)) |