From 5547901a379ea5598124345e57693459c1828396 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.com>
Date: Sun, 20 Aug 2017 13:56:19 +0100
Subject: mpg123: hook up to build system

https://bugzilla.gnome.org/show_bug.cgi?id=774252
---
 ext/Makefile.am        | 8 ++++++++
 ext/meson.build        | 1 +
 ext/mpg123/meson.build | 8 ++------
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'ext')

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 6f0018252..1bb540bb5 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -52,6 +52,12 @@ else
 LIBPNG_DIR =
 endif
 
+if USE_MPG123
+MPG123_DIR = mpg123
+else
+MPG123_DIR =
+endif
+
 if USE_DV1394
 DV1394_DIR = raw1394
 else
@@ -113,6 +119,7 @@ SUBDIRS = \
 	$(LIBDV_DIR) \
 	$(LIBMNG_DIR) \
 	$(LIBPNG_DIR) \
+	$(MPG123_DIR) \
 	$(PULSE_DIR) \
 	$(SHOUT2_DIR) \
 	$(SOUP_DIR) \
@@ -131,6 +138,7 @@ DIST_SUBDIRS = \
 	jpeg \
 	libcaca \
 	libpng \
+	mpg123 \
 	pulse \
 	raw1394 \
 	shout2 \
diff --git a/ext/meson.build b/ext/meson.build
index a2967f608..92f75ef10 100644
--- a/ext/meson.build
+++ b/ext/meson.build
@@ -10,6 +10,7 @@ if cc.get_id() != 'msvc'
   subdir('dv')
 endif
 subdir('libpng')
+subdir('mpg123')
 subdir('raw1394')
 subdir('pulse')
 subdir('shout2')
diff --git a/ext/mpg123/meson.build b/ext/mpg123/meson.build
index a575449bd..3891fd7d0 100644
--- a/ext/mpg123/meson.build
+++ b/ext/mpg123/meson.build
@@ -1,13 +1,9 @@
-mpg123_sources = [
-  'gstmpg123audiodec.c',
-]
-
 mpg123_dep = dependency('libmpg123', version : '>= 1.3', required : false)
 
 if mpg123_dep.found()
   gstmpg123 = library('gstmpg123',
-    mpg123_sources,
-    c_args : ugly_args,
+    'gstmpg123audiodec.c',
+    c_args : gst_plugins_good_args,
     include_directories : [configinc],
     dependencies : [gstaudio_dep, mpg123_dep],
     install : true,
-- 
cgit v1.2.3