summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-05-02 15:04:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-05-02 15:04:31 +0200
commit7e1a3ecf15f95cb03ddca85c21f4cbb4d3de7fd2 (patch)
tree8936e23825840c53a20178979de458c14cceccff
parent293276174d4a64f7c8fd35017957e021e9c5dcd0 (diff)
update and use single binary without modules
-rw-r--r--package/mpg123/Makefile17
-rw-r--r--package/mpg123/patches/patch-build_ltmain_sh14
2 files changed, 15 insertions, 16 deletions
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 5f7960371..ca6ec0539 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -4,12 +4,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= mpg123
-PKG_VERSION:= 1.12.1
-PKG_RELEASE:= 2
-PKG_MD5SUM:= e7d810a75d22954169f1530a436aca4c
+PKG_VERSION:= 1.13.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b1f990ce76dcf2fdf9d53ac39fc6bc7e
PKG_DESCR:= mp3 console player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= libpthread alsa-lib libltdl
+PKG_DEPENDS:= libpthread alsa-lib
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.mpg123.de/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -20,12 +20,11 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,MPG123,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ARGS+= --disable-shared \
+ --with-default-audio=alsa
+
post-install:
- $(INSTALL_DIR) $(IDIR_MPG123)/usr/bin $(IDIR_MPG123)/usr/lib
- $(INSTALL_DIR) $(IDIR_MPG123)/usr/lib/mpg123
- $(CP) $(WRKINST)/usr/lib/libmpg123.so* $(IDIR_MPG123)/usr/lib
- $(CP) $(WRKINST)/usr/lib/mpg123/*.la $(IDIR_MPG123)/usr/lib/mpg123
- $(CP) $(WRKINST)/usr/lib/mpg123/*.so $(IDIR_MPG123)/usr/lib/mpg123
+ $(INSTALL_DIR) $(IDIR_MPG123)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \
$(IDIR_MPG123)/usr/bin
diff --git a/package/mpg123/patches/patch-build_ltmain_sh b/package/mpg123/patches/patch-build_ltmain_sh
index f2c5aadfa..20cae3022 100644
--- a/package/mpg123/patches/patch-build_ltmain_sh
+++ b/package/mpg123/patches/patch-build_ltmain_sh
@@ -1,11 +1,11 @@
---- mpg123-1.12.1.orig/build/ltmain.sh 2010-03-31 10:28:55.000000000 +0200
-+++ mpg123-1.12.1/build/ltmain.sh 2011-01-16 00:25:49.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- mpg123-1.13.3.orig/build/ltmain.sh 2011-04-03 09:52:37.000000000 +0200
++++ mpg123-1.13.3/build/ltmain.sh 2011-05-02 15:02:20.131176071 +0200
+@@ -5840,7 +5840,7 @@ func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-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)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"