From 1473b662de2c46ece4ac7e5e42c86af7b159a649 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.com>
Date: Sat, 26 Aug 2017 09:03:08 +0100
Subject: lame: hook up to build system

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

(limited to 'ext')

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 1bb540bb5..fee653f55 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -34,6 +34,12 @@ else
 JPEG_DIR =
 endif
 
+if USE_LAME
+LAME_DIR = lame
+else
+LAME_DIR =
+endif
+
 if USE_LIBCACA
 LIBCACA_DIR = libcaca
 else
@@ -115,6 +121,7 @@ SUBDIRS = \
 	$(GDK_PIXBUF_DIR) \
 	$(JACK_DIR) \
 	$(JPEG_DIR) \
+	$(LAME_DIR) \
 	$(LIBCACA_DIR) \
 	$(LIBDV_DIR) \
 	$(LIBMNG_DIR) \
@@ -136,6 +143,7 @@ DIST_SUBDIRS = \
 	gdk_pixbuf \
 	jack \
 	jpeg \
+	lame \
 	libcaca \
 	libpng \
 	mpg123 \
diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
index 5e5b3a02d..46198c8ec 100644
--- a/ext/lame/Makefile.am
+++ b/ext/lame/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstlame.la
 libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
 libgstlame_la_CFLAGS = \
         $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
-libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
 libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
diff --git a/ext/lame/meson.build b/ext/lame/meson.build
index 2812cb930..e3e61b68f 100644
--- a/ext/lame/meson.build
+++ b/ext/lame/meson.build
@@ -10,7 +10,7 @@ if lame_dep.found() and cc.has_header_symbol('lame/lame.h', 'lame_init')
   endif
   lame = library('gstlame',
     ['gstlamemp3enc.c', 'plugin.c'],
-    c_args : ugly_args + lame_extra_c_args,
+    c_args : gst_plugins_good_args + lame_extra_c_args,
     include_directories : [configinc, libsinc],
     dependencies : [gstaudio_dep, lame_dep],
     install : true,
diff --git a/ext/meson.build b/ext/meson.build
index 92f75ef10..3bc8c8212 100644
--- a/ext/meson.build
+++ b/ext/meson.build
@@ -4,6 +4,7 @@ subdir('flac')
 subdir('gdk_pixbuf')
 subdir('jack')
 subdir('jpeg')
+subdir('lame')
 subdir('libcaca')
 # FIXME: dv plugin fails to link with msvc, wants pthread.lib
 if cc.get_id() != 'msvc'
-- 
cgit v1.2.3