mpg123: Add mpg123 library and build the plugin

https://bugzilla.gnome.org/show_bug.cgi?id=754348

5 files changed, 217 insertions, 3 deletions

diff --git a/packages/gstreamer-1.0-codecs-restricted.package b/packages/gstreamer-1.0-codecs-restricted.package
index 337ab61e..072becdd 100644
--- a/packages/gstreamer-1.0-codecs-restricted.package
+++ b/packages/gstreamer-1.0-codecs-restricted.package
@@ -16,7 +16,7 @@ class Package(package.Package):
     uuid = '0a4e77e8-3c8c-4e7d-890b-1538d36f1816'
     deps = ['gstreamer-1.0-core']
 
-    files = ['a52dec:libs', 'opencore-amr:libs', 'libmad:libs', 'libmpeg2:libs',
+    files = ['a52dec:libs', 'opencore-amr:libs', 'libmad:libs', 'libmpeg2:libs', 'mpg123:libs',
              'faad2:libs', 'libdca:libs', 'vo-aacenc:libs', 'x264:libs', 'lame:libs',
              'gst-plugins-ugly-1.0:plugins_codecs_restricted',
              'gst-plugins-bad-1.0:plugins_codecs_restricted']
diff --git a/recipes/gst-plugins-ugly-1.0-static.recipe b/recipes/gst-plugins-ugly-1.0-static.recipe
index 12f8fe9b..d337c586 100644
--- a/recipes/gst-plugins-ugly-1.0-static.recipe
+++ b/recipes/gst-plugins-ugly-1.0-static.recipe
@@ -10,7 +10,7 @@ class Recipe(custom.GStreamerStatic):
     remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'}
     commit = 'origin/master'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
-            'libdvdread', 'libmpeg2', 'libmad', 'x264', 'lame']
+            'libdvdread', 'libmpeg2', 'libmad', 'x264', 'lame', 'mpg123']
 
     files_plugins_codecs_restricted_devel = [
              'libgsta52dec',
@@ -25,6 +25,7 @@ class Recipe(custom.GStreamerStatic):
              'libgstrmdemux',
              'libgstx264',
              'libgstlame',
+             'libgstmpg123',
     ]
 
     files_plugins_dvd_devel = [
diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe
index 62ddeec5..6ab1dfed 100644
--- a/recipes/gst-plugins-ugly-1.0.recipe
+++ b/recipes/gst-plugins-ugly-1.0.recipe
@@ -10,7 +10,7 @@ class Recipe(recipe.Recipe):
     remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'}
     commit = 'origin/master'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
-            'libdvdread', 'libmpeg2', 'libmad', 'x264', 'lame']
+            'libdvdread', 'libmpeg2', 'libmad', 'x264', 'lame', 'mpg123']
 
     files_plugins_codecs_restricted = [
              'lib/gstreamer-1.0/libgsta52dec%(mext)s',
@@ -25,6 +25,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstrmdemux%(mext)s',
              'lib/gstreamer-1.0/libgstx264%(mext)s',
              'lib/gstreamer-1.0/libgstlame%(mext)s',
+             'lib/gstreamer-1.0/libgstmpg123%(mext)s',
     ]
 
     files_plugins_dvd = [
diff --git a/recipes/mpg123.recipe b/recipes/mpg123.recipe
new file mode 100644
index 00000000..0c39ff68
--- /dev/null
+++ b/recipes/mpg123.recipe
@@ -0,0 +1,15 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+class Recipe(recipe.Recipe):
+    name = 'mpg123'
+    version = '1.23.1'
+    stype = SourceType.TARBALL
+    url = 'http://downloads.sourceforge.net/project/mpg123/mpg123/1.23.1/mpg123-1.23.1.tar.bz2'
+    licenses = [License.LGPLv2_1]
+    autoreconf = True
+    configure_options = '--with-audio=dummy --enable-static'
+    patches = ['mpg123/0001-Disable-tools-and-libout123-library.patch']
+
+    files_libs = ['libmpg123', 'lib/pkgconfig/libmpg123.pc']
+    files_devel = ['include/mpg123.h', 'include/fmt123.h']
+
diff --git a/recipes/mpg123/0001-Disable-tools-and-libout123-library.patch b/recipes/mpg123/0001-Disable-tools-and-libout123-library.patch
new file mode 100644
index 00000000..6585c817
--- /dev/null
+++ b/recipes/mpg123/0001-Disable-tools-and-libout123-library.patch
@@ -0,0 +1,197 @@
+From b3050ea3cc6ab4fb8b9c29249dc9d67b66617d69 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Thu, 18 Feb 2016 23:48:31 +0200
+Subject: [PATCH] Disable tools and libout123 library
+
+---
+ Makefile.am       |   8 +--
+ src/Makemodule.am | 148 ------------------------------------------------------
+ 2 files changed, 2 insertions(+), 154 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d695a3b..c80e675 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -29,9 +29,7 @@ AM_CPPFLAGS += \
+   -I$(top_srcdir)/src \
+   -I$(top_srcdir)/src/compat \
+   -I$(top_srcdir)/src/libmpg123 \
+-  -I$(top_srcdir)/src/libout123 \
+-  -I$(top_builddir)/src/libmpg123 \
+-  -I$(top_builddir)/src/libout123
++  -I$(top_builddir)/src/libmpg123
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = 
+@@ -41,9 +39,7 @@ include src/Makemodule.am
+ include doc/Makemodule.am
+ 
+ # Stuff from this directory.
+-pkgconfig_DATA += libmpg123.pc libout123.pc
+-
+-dist_man_MANS += man1/mpg123.1 man1/out123.1
++pkgconfig_DATA += libmpg123.pc
+ 
+ # mpg123.spec is autogenerated but needs to be present in tarball!
+ EXTRA_DIST += \
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index 4e9eafb..09cd155 100644
+--- a/src/Makemodule.am
++++ b/src/Makemodule.am
+@@ -1,153 +1,5 @@
+ # Module for non-recursive mpg123 build system.
+ 
+ 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 = \
+-  $(LIBM) \
+-  src/libmpg123/libmpg123.la \
+-  src/libout123/libout123.la
+-
+-src_mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@
+-
+-src_out123_LDADD = \
+-  src/libout123/libout123.la
+-
+-src_out123_LDFLAGS = @EXEC_LT_LDFLAGS@
+-
+-EXTRA_DIST += \
+-  src/mpg123-with-modules \
+-  src/out123-with-modules
+ 
+ CLEANFILES += src/*.a
+-
+-src_mpg123_id3dump_LDADD = src/libmpg123/libmpg123.la
+-
+-src_mpg123_strip_LDADD = src/libmpg123/libmpg123.la
+-
+-EXTRA_PROGRAMS += \
+-  src/tests/seek_whence \
+-  src/tests/noise \
+-  src/tests/text \
+-  src/tests/plain_id3
+-
+-src_mpg123_SOURCES = \
+-  src/audio.c \
+-  src/audio.h \
+-  src/common.c \
+-  src/common.h \
+-  src/sysutil.c \
+-  src/sysutil.h \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h \
+-  src/control_generic.c \
+-  src/equalizer.c \
+-  src/getlopt.c \
+-  src/getlopt.h \
+-  src/httpget.c \
+-  src/httpget.h \
+-  src/resolver.c \
+-  src/resolver.h \
+-  src/genre.h \
+-  src/genre.c \
+-  src/mpg123.c \
+-  src/mpg123app.h \
+-  src/metaprint.c \
+-  src/metaprint.h \
+-  src/local.h \
+-  src/local.c \
+-  src/playlist.c \
+-  src/playlist.h \
+-  src/streamdump.h \
+-  src/streamdump.c \
+-  src/term.c \
+-  src/term.h \
+-  src/win32_support.h
+-
+-# Does that finally work to build/link the correct object file?
+-src_mpg123_SOURCES += 
+-
+-# Replace common.h by sysutil.h!
+-src_out123_SOURCES = \
+-  src/sysutil.c \
+-  src/sysutil.h \
+-  src/common.h \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h \
+-  src/getlopt.c \
+-  src/getlopt.h \
+-  src/out123.c \
+-  src/mpg123app.h \
+-  src/win32_support.h
+-
+-src_mpg123_id3dump_SOURCES = \
+-  src/mpg123-id3dump.c \
+-  src/getlopt.c \
+-  src/getlopt.h \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h
+-
+-src_mpg123_strip_SOURCES = \
+-  src/mpg123-strip.c \
+-  src/getlopt.c \
+-  src/getlopt.h \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h
+-
+-if WIN32_CODES
+-src_mpg123_SOURCES += \
+-  src/win32_support.c \
+-  src/win32_net.c
+-
+-src_out123_SOURCES+= \
+-  src/win32_support.c
+-
+-src_mpg123_id3dump_SOURCES += \
+-  src/win32_support.c
+-endif
+-
+-src_tests_seek_whence_SOURCES = \
+-  src/tests/seek_whence.c \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h
+-
+-src_tests_seek_whence_DEPENDENCIES = src/libmpg123/libmpg123.la
+-src_tests_seek_whence_LDADD = src/libmpg123/libmpg123.la
+-
+-src_tests_noise_SOURCES = \
+-  src/tests/noise.c \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h \
+-  src/libmpg123/dither.h \
+-  src/libmpg123/dither_impl.h
+-
+-src_tests_text_SOURCES = \
+-  src/tests/text.c \
+-  src/tests/testtext.h \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h
+-
+-src_tests_text_DEPENDENCIES = src/libmpg123/libmpg123.la
+-src_tests_text_LDADD = src/libmpg123/libmpg123.la
+-
+-src_tests_plain_id3_SOURCES = \
+-  src/tests/plain_id3.c \
+-  src/compat.c \
+-  src/compat/compat.h \
+-  src/compat/compat_impl.h
+-
+-src_tests_plain_id3_DEPENDENCIES = src/libmpg123/libmpg123.la
+-src_tests_plain_id3_LDADD = src/libmpg123/libmpg123.la
+-- 
+2.7.0
+