[vlc-commits] contribs: mpg123: update to 1.23.8

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Dec 21 18:07:27 2016 +0100| [0b674cab22fe6da8939c8779747a4ec16c56a04c] | committer: Thomas Guillem

contribs: mpg123: update to 1.23.8

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b674cab22fe6da8939c8779747a4ec16c56a04c
---

 contrib/src/mpg123/SHA512SUMS        |  2 +-
 contrib/src/mpg123/mpg123-libm.patch | 20 --------------------
 contrib/src/mpg123/no-programs.patch | 25 +++++++++++++++----------
 contrib/src/mpg123/rules.mak         |  6 +++---
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/contrib/src/mpg123/SHA512SUMS b/contrib/src/mpg123/SHA512SUMS
index e11df2f..84f695f 100644
--- a/contrib/src/mpg123/SHA512SUMS
+++ b/contrib/src/mpg123/SHA512SUMS
@@ -1 +1 @@
-d8552b3522fa58647cee7c43227737993851452a15dc6d3ae6948c6c62d4a8f6064e2b284f170413aa3f805a3f3e1a6f1faac7d19daddd25c6790863e4925212  mpg123-1.22.4.tar.bz2
+7b77b543bd6a127095c6a6a2e7f9b5933f5a391734cc6dcbc160f786008afcd74646a7c304e1be682042221648b0fcae7efafda4bbe66ba30a7021740abddc34  mpg123-1.23.8.tar.bz2
diff --git a/contrib/src/mpg123/mpg123-libm.patch b/contrib/src/mpg123/mpg123-libm.patch
deleted file mode 100644
index a55d851..0000000
--- a/contrib/src/mpg123/mpg123-libm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trunk/configure.ac	2015/09/06 15:59:04	3820
-+++ trunk/configure.ac	2015/09/07 07:59:55	3827
-@@ -93,6 +93,8 @@
- AM_PROG_CC_C_O
- AC_PROG_CPP
- AC_PROG_INSTALL
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
- dnl "Checking for egrep is broken after removal of libltdl stuff... checks use $EGREP, so searching it here."
- AC_PROG_EGREP
- AC_C_CONST
---- mpg123/libmpg123.pc.in.orig	2015-08-12 01:33:47.000000000 -0400
-+++ mpg123/libmpg123.pc.in	2016-02-03 20:40:25.335615001 -0500
-@@ -7,5 +7,5 @@
- Description: An optimised MPEG Audio decoder
- Requires: 
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lmpg123 
-+Libs: -L${libdir} -lmpg123 @LIBM@
- Cflags: -I${includedir} 
diff --git a/contrib/src/mpg123/no-programs.patch b/contrib/src/mpg123/no-programs.patch
index aaec519..6ebce2e 100644
--- a/contrib/src/mpg123/no-programs.patch
+++ b/contrib/src/mpg123/no-programs.patch
@@ -1,11 +1,16 @@
---- mpg123/Makefile.am	2014-09-28 23:27:28.000000000 +0200
-+++ mpg123.new/Makefile.am	2014-12-01 19:26:28.156173697 +0100
-@@ -6,7 +6,7 @@
- ## initially written by Nicholas J. Humfrey
- dist_man_MANS = man1/mpg123.1 man1/out123.1
- 
--SUBDIRS = src doc
-+SUBDIRS = src/libmpg123 doc
- DIST_SUBDIRS = src doc
- ACLOCAL_AMFLAGS = -I m4
+diff -Naur mpg123/src/Makemodule.am mpg123.new/src/Makemodule.am
+--- mpg123/src/Makemodule.am	2016-09-26 23:20:25.000000000 +0200
++++ mpg123.new/src/Makemodule.am	2016-12-21 17:40:12.917251022 +0100
+@@ -4,12 +4,6 @@
+ include src/libmpg123/Makemodule.am
+ include src/libout123/Makemodule.am
  
+-bin_PROGRAMS += \
+-  src/mpg123 \
+-  src/out123 \
+-  src/mpg123-id3dump \
+-  src/mpg123-strip
+-
+ src_mpg123_LDADD = \
+   src/compat/libcompat.la \
+   src/libmpg123/libmpg123.la \
diff --git a/contrib/src/mpg123/rules.mak b/contrib/src/mpg123/rules.mak
index c933d8b..3fa884c 100644
--- a/contrib/src/mpg123/rules.mak
+++ b/contrib/src/mpg123/rules.mak
@@ -1,6 +1,6 @@
 # mpg123
-MPG123_VERSION := 1.22.4
-MPG123_URL := $(SF)/mpg123/$(MPG123_VERSION)/mpg123-$(MPG123_VERSION).tar.bz2
+MPG123_VERSION := 1.23.8
+MPG123_URL := $(SF)/mpg123/mpg123/$(MPG123_VERSION)/mpg123-$(MPG123_VERSION).tar.bz2
 
 PKGS += mpg123
 ifeq ($(call need_pkg,"mpg123"),)
@@ -8,6 +8,7 @@ PKGS_FOUND += mpg123
 endif
 
 MPG123CONF = $(HOSTCONF)
+MPG123CONF += --with-default-audio=dummy --enable-buffer=no
 
 ifdef HAVE_ANDROID
 ifeq ($(ANDROID_ABI), armeabi-v7a)
@@ -33,7 +34,6 @@ $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2:
 mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
 	$(UNPACK)
 	$(APPLY) $(SRC)/mpg123/no-programs.patch
-	$(APPLY) $(SRC)/mpg123/mpg123-libm.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/mpg123/mpg123_android_off_t.patch
 endif