[vlc-commits] Contribs: mpg123, don't build programs

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Dec  2 16:11:38 2014 +0100| [18091f15cda12e2e65849c428de10561f33010d6] | committer: Jean-Baptiste Kempf

Contribs: mpg123, don't build programs

This failed on Android, for example

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

 contrib/src/mpg123/no-programs.patch |   11 +++++++++++
 contrib/src/mpg123/rules.mak         |    1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/mpg123/no-programs.patch b/contrib/src/mpg123/no-programs.patch
new file mode 100644
index 0000000..aaec519
--- /dev/null
+++ b/contrib/src/mpg123/no-programs.patch
@@ -0,0 +1,11 @@
+--- 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 --git a/contrib/src/mpg123/rules.mak b/contrib/src/mpg123/rules.mak
index 9566b9c..afe5202 100644
--- a/contrib/src/mpg123/rules.mak
+++ b/contrib/src/mpg123/rules.mak
@@ -14,6 +14,7 @@ $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2:
 
 mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
 	$(UNPACK)
+	$(APPLY) $(SRC)/mpg123/no-programs.patch
 	$(MOVE)
 
 .mpg123: mpg123