diff options
| -rw-r--r-- | package/moc/Makefile | 7 | ||||
| -rw-r--r-- | package/moc/patches/patch-configure | 20 | ||||
| -rw-r--r-- | package/moc/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/moc/patches/patch-options_c | 11 |
4 files changed, 4 insertions, 45 deletions
diff --git a/package/moc/Makefile b/package/moc/Makefile index a5849b1de..11bc9243c 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= moc -PKG_VERSION:= 2.5.0-alpha4 +PKG_VERSION:= 2.5.0-beta1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0 +PKG_MD5SUM:= 795ecba86847e082aa2f21937cc04804 PKG_DESCR:= console music player PKG_SECTION:= multimedia PKG_DEPENDS:= libmad libvorbis libcurl libflac PKG_DEPENDS+= libncurses libid3tag PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv-tiny -PKG_BUILDDEP+= libid3tag db +PKG_BUILDDEP+= libid3tag db libtool PKG_URL:= http://moc.daper.net/ PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/ @@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --without-jack \ --without-oss \ --without-musepack \ diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure deleted file mode 100644 index 2330e0f4c..000000000 --- a/package/moc/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- 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' - - --OS=`uname 2>/dev/null` -+OS=Linux - - case "$OS" in - Linux) -@@ -17688,7 +17688,7 @@ _ACEOF - ;; - esac - --LDFLAGS="$LDFLAGS -export-dynamic" -+LDFLAGS="$LDFLAGS" - - { $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-ltmain_sh b/package/moc/patches/patch-ltmain_sh deleted file mode 100644 index b9a79ecd3..000000000 --- a/package/moc/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- moc-2.5.0-alpha4.orig/ltmain.sh 2009-09-25 10:57:23.000000000 +0200 -+++ moc-2.5.0-alpha4/ltmain.sh 2011-01-16 00:22:15.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c deleted file mode 100644 index b5e9ca676..000000000 --- a/package/moc/patches/patch-options_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)) |