The --with-cpu argument is left untouched to be auto-detected at build-
and/or runtime.
libltdl is not needed because modules are disabled.
Also add an option to enable integer quality mode and fix configure
options.
Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
rules/mpg123.in | 14 ++++++++++++--
rules/mpg123.make | 41 ++++++++++++++++++++++++++++++++++++-----
2 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/rules/mpg123.in b/rules/mpg123.in
index 9abbffc05..5f672d2f1 100644
--- a/rules/mpg123.in
+++ b/rules/mpg123.in
@@ -1,9 +1,8 @@
## SECTION=multimedia_sound
-config MPG123
+menuconfig MPG123
tristate
prompt "mpg123"
- select LIBLTDL
select ALSA_LIB
select ALSA_LIB_PCM
help
@@ -14,3 +13,14 @@ config MPG123
It is free software licensed under LGPL 2.1 (the officially released
sources,
some files in subversion repository may differ).
+if MPG123
+
+config MPG123_INT_QUALITY
+ bool
+ default n
+ prompt "integer quality mode"
+ help
+ Use rounding instead of fast truncation for integer output.
+ Enable this if you need ISO MPEG compliance.
+
+endif
diff --git a/rules/mpg123.make b/rules/mpg123.make
index b0eadb45b..936b267dd 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123
#
# Paths and names
#
-MPG123_VERSION := 1.23.8
-MPG123_MD5 := 4dde045123a2ad1e385a0a82c0ef9268
+MPG123_VERSION := 1.25.0
+MPG123_MD5 := 2ffbe29c99130215b0ee7d1b11c0ea4b
MPG123 := mpg123-$(MPG123_VERSION)
MPG123_SUFFIX := tar.bz2
MPG123_URL := http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
@@ -37,10 +37,41 @@ MPG123_LICENSE_FILES := \
MPG123_CONF_TOOL := autoconf
MPG123_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --enable-modules=no \
+ --enable-debug=no \
+ --disable-nagging \
+ --enable-gapless \
+ --enable-fifo \
$(GLOBAL_IPV6_OPTION) \
- --with-audio=alsa\
- --with-default-audio=alsa\
- --enable-modules=no
+ --enable-network \
+ --enable-id3v2 \
+ --enable-string \
+ --enable-icy \
+ --enable-ntom \
+ --enable-downsample \
+ --enable-feeder \
+ --enable-messages \
+ --enable-new-huffman \
+ --$(call ptx/endis, PTXCONF_MPG123_INT_QUALITY)-int-quality \
+ --enable-16bit \
+ --enable-8bit \
+ --enable-32bit \
+ --enable-real \
+ --disable-equalizer \
+ --disable-yasm \
+ --enable-ieeefloat \
+ --enable-buffer \
+ --disable-newoldwritesample \
+ --enable-layer1 \
+ --enable-layer2 \
+ --enable-layer3 \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --enable-lfs-alias \
+ --disable-feature_report \
+ --with-audio=alsa \
+ --with-default-audio=alsa \
+ --with-optimization=2 \
+ --with-seektable=1000
# needed when compiling without IPv6
MPG123_CPPFLAGS := -D_GNU_SOURCE
--
2.13.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
