From f75e4fbc11681b5175cd69cf0bb045a13b2b6595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 3 Aug 2012 11:48:02 +0100
Subject: [PATCH] mpg123: hook up to build system

---
 configure.ac           | 10 ++++++++++
 ext/Makefile.am        | 10 +++++++++-
 ext/mpg123/Makefile.am | 27 +++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 ext/mpg123/Makefile.am

diff --git a/configure.ac b/configure.ac
index 4b18499dbb..34da8f666e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1212,6 +1212,14 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [
   fi
 ])
 
+dnl *** mpg123 ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_MPG123, true)
+AG_GST_CHECK_FEATURE(MPG123, [mpg123 audio decoder], mpg123, [
+  PKG_CHECK_MODULES(MPG123, libmpg123, HAVE_MPG123="yes", HAVE_MPG123="no")
+  AC_SUBST(MPG123_CFLAGS)
+  AC_SUBST(MPG123_LIBS)
+])
+
 dnl *** mplex ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MPLEX, true)
 AG_GST_CHECK_FEATURE(MPLEX, [mplex], mplex, [
@@ -1827,6 +1835,7 @@ AM_CONDITIONAL(USE_LINSYS, false)
 AM_CONDITIONAL(USE_MODPLUG, false)
 AM_CONDITIONAL(USE_MIMIC, false)
 AM_CONDITIONAL(USE_MPEG2ENC, false)
+AM_CONDITIONAL(USE_MPG123, false)
 AM_CONDITIONAL(USE_MPLEX, false)
 AM_CONDITIONAL(USE_MUSEPACK, false)
 AM_CONDITIONAL(USE_MUSICBRAINZ, false)
@@ -2080,6 +2089,7 @@ ext/libmms/Makefile
 ext/Makefile
 ext/modplug/Makefile
 ext/mpeg2enc/Makefile
+ext/mpg123/Makefile
 ext/mimic/Makefile
 ext/mplex/Makefile
 ext/musepack/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 98809be36d..824f1d4fa9 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -178,6 +178,12 @@ else
 MPEG2ENC_DIR=
 endif
 
+if USE_MPG123
+MPG123_DIR=mpg123
+else
+MPG123_DIR=
+endif
+
 if USE_MIMIC
 MIMIC_DIR=mimic
 else
@@ -393,6 +399,7 @@ SUBDIRS=\
 	$(LIBMMS_DIR) \
 	$(MODPLUG_DIR) \
 	$(MPEG2ENC_DIR) \
+	$(MPG123_DIR) \
 	$(MIMIC_DIR) \
 	$(MPLEX_DIR) \
 	$(MUSEPACK_DIR) \
@@ -434,7 +441,7 @@ DIST_SUBDIRS = \
 	dc1394 \
 	dirac \
 	directfb \
-        wayland \
+	wayland \
 	faac \
 	faad \
 	flite \
@@ -449,6 +456,7 @@ DIST_SUBDIRS = \
 	modplug \
 	mimic \
 	mpeg2enc \
+	mpg123 \
 	mplex \
 	musepack \
 	musicbrainz \
diff --git a/ext/mpg123/Makefile.am b/ext/mpg123/Makefile.am
new file mode 100644
index 0000000000..6e6f4385e8
--- /dev/null
+++ b/ext/mpg123/Makefile.am
@@ -0,0 +1,27 @@
+plugin_LTLIBRARIES = libgstmpg123.la
+
+libgstmpg123_la_SOURCES = gstmpg123audiodec.c
+libgstmpg123_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(MPG123_CFLAGS)
+libgstmpg123_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
+	$(GST_BASE_LIBS) $(GST_LIBS) $(MPG123_LIBS)
+libgstmpg123_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstmpg123_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = gstmpg123audiodec.c
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+	androgenizer \
+	-:PROJECT libgstmpg123 -:SHARED libgstmpg123 \
+	 -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+	 -:SOURCES $(libgstmpg123_la_SOURCES) \
+	 -:CPPFLAGS $(CPPFLAGS) \
+	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpg123_la_CFLAGS) \
+	 -:LDFLAGS $(libgstmpg123_la_LDFLAGS) \
+	           $(libgstmpg123_la_LIBADD) \
+	           -ldl \
+	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \
+	> $@