Commit e62fb52f authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

mpg123.recipe: Bump to 1.26.3 and remove need for autoreconf

Part-of: <!616>
parent 1945df10
......@@ -2,14 +2,13 @@
class Recipe(recipe.Recipe):
name = 'mpg123'
version = '1.25.12'
version = '1.26.3'
stype = SourceType.TARBALL
url = 'sf://.tar.bz2'
tarball_checksum = '1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1'
tarball_checksum = '30c998785a898f2846deefc4d17d6e4683a5a550b7eacf6ea506e30a7a736c6e'
licenses = [License.LGPLv2_1Plus]
autoreconf = True
configure_options = '--with-audio=dummy --enable-static'
patches = ['mpg123/0001-Disable-tools-and-libout123-library.patch']
patches = ['mpg123/0001-Only-build-libmpg123-under-libraries.patch']
files_libs = ['libmpg123']
files_devel = ['include/mpg123.h', 'include/fmt123.h', 'lib/pkgconfig/libmpg123.pc']
......@@ -28,4 +27,7 @@ class Recipe(recipe.Recipe):
if self.config.target_arch == Architecture.X86:
# make sure we use 32bit asm
self.configure_options += ' --with-cpu=x86 '
# Only install the libmpg123 library and things needed for it
self.make_install = self.make + ['install-libLTLIBRARIES', 'install-pkgconfigDATA',
'install-includeHEADERS', 'install-nodist_includeHEADERS']
self.make += ['src/libmpg123/libmpg123.la']
From 96e763ea3bd7b61a6b708a6d9de4022e713debaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Wed, 14 Feb 2018 14:27:34 +1100
Subject: [PATCH] Disable tools and libout123 library
---
Makefile.am | 4 +-
src/Makemodule.am | 135 ------------------------------------------------------
2 files changed, 1 insertion(+), 138 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c6d51ba..dd56925 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,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 =
diff --git a/src/Makemodule.am b/src/Makemodule.am
index 88ed85d..c08edda 100644
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@@ -2,140 +2,5 @@
include src/compat/Makemodule.am
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 = \
- src/compat/libcompat.la \
- src/libmpg123/libmpg123.la \
- src/libout123/libout123.la \
- $(LIBM)
-
-src_mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@
-
-src_out123_LDADD = \
- src/compat/libcompat.la \
- src/libout123/libout123.la
-
-src_out123_LDFLAGS = @EXEC_LT_LDFLAGS@
-
-EXTRA_DIST += \
- src/intsym.h \
- src/mpg123-with-modules \
- src/out123-with-modules
CLEANFILES += src/*.a
-
-src_mpg123_id3dump_LDADD = \
- src/compat/libcompat.la \
- src/libmpg123/libmpg123.la
-
-src_mpg123_strip_LDADD = \
- src/compat/libcompat.la \
- 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/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/waves.c \
- src/waves.h \
- src/common.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_mpg123_strip_SOURCES = \
- src/mpg123-strip.c \
- src/getlopt.c \
- src/getlopt.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_tests_seek_whence_LDADD = \
- src/compat/libcompat.la \
- src/libmpg123/libmpg123.la
-
-src_tests_noise_SOURCES = \
- src/tests/noise.c \
- src/libmpg123/dither.h \
- src/libmpg123/dither_impl.h
-src_tests_noise_LDADD = \
- src/compat/libcompat.la
-
-src_tests_text_SOURCES = \
- src/tests/text.c \
- src/tests/testtext.h
-src_tests_text_LDADD = \
- src/compat/libcompat.la \
- src/libmpg123/libmpg123.la
-
-src_tests_plain_id3_SOURCES = \
- src/tests/plain_id3.c
-src_tests_plain_id3_LDADD = \
- src/compat/libcompat.la \
- src/libmpg123/libmpg123.la
--
2.16.1
From de693c5b95bbdcffe0be33871d81408a9fa4bdb9 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed, 30 Sep 2020 17:20:57 +0530
Subject: [PATCH] Only build libmpg123 under libraries
---
Makefile.in | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 6c8c92f..9340854 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1527,17 +1527,15 @@ pkglib_LTLIBRARIES = $(am__append_3) $(am__append_4) $(am__append_5) \
$(am__append_18) $(am__append_19) $(am__append_20) \
$(am__append_21) $(am__append_22) $(am__append_23) \
$(am__append_24) $(am__append_25) $(am__append_26)
-lib_LTLIBRARIES = src/libmpg123/libmpg123.la \
- src/libout123/libout123.la src/libsyn123/libsyn123.la
+lib_LTLIBRARIES = src/libmpg123/libmpg123.la
noinst_LIBRARIES =
# Precursor to the proper libout123.
# For now only wrapping the module loader or the legacy module.
noinst_LTLIBRARIES = src/compat/libcompat.la \
src/compat/libcompat_str.la src/compat/libcompat_dl.la \
- $(am__append_2) src/libout123/libmodule.la
-nodist_include_HEADERS = src/libmpg123/mpg123.h src/libout123/out123.h \
- src/libsyn123/syn123.h
+ $(am__append_2)
+nodist_include_HEADERS = src/libmpg123/mpg123.h
include_HEADERS = src/libmpg123/fmt123.h
dist_man_MANS = man1/mpg123.1 man1/out123.1
@@ -1558,7 +1556,7 @@ pkgconfigdir = $(libdir)/pkgconfig
# Include Make modules from subdirectories.
# Stuff from this directory.
-pkgconfig_DATA = libmpg123.pc libout123.pc libsyn123.pc
+pkgconfig_DATA = libmpg123.pc
src_tests_volume_SOURCES = \
src/tests/volume.c
--
2.27.0.windows.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment