From 7712869cf58889541bc4f900bc32aa60805d0e48 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 15 Nov 2017 23:53:25 +0100 Subject: [PATCH] Bump packages after libogg update --- packages/gst-plugins-base/build.sh | 1 + packages/icecast/build.sh | 1 + packages/libflac/build.sh | 2 +- packages/libmp3splt/build.sh | 2 +- packages/liboggz/build.sh | 2 +- packages/libsndfile/Makefile.am.patch | 302 ++++++++++++++++++++++++++++++++++ packages/libsndfile/autogen.sh.patch | 22 +++ packages/libsndfile/build.sh | 15 +- packages/libvorbis/build.sh | 2 +- packages/opus-tools/build.sh | 1 + packages/sox/build.sh | 2 +- packages/vorbis-tools/build.sh | 2 +- 12 files changed, 343 insertions(+), 11 deletions(-) create mode 100644 packages/libsndfile/Makefile.am.patch create mode 100644 packages/libsndfile/autogen.sh.patch diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh index 6ec9eb6d..75fff2a2 100644 --- a/packages/gst-plugins-base/build.sh +++ b/packages/gst-plugins-base/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer base plug-ins" TERMUX_PKG_VERSION=1.12.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="gstreamer, libogg, libopus, libvorbis" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/icecast/build.sh b/packages/icecast/build.sh index fbbc9bef..6b40ad4e 100644 --- a/packages/icecast/build.sh +++ b/packages/icecast/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://icecast.org TERMUX_PKG_DESCRIPTION="Icecast is a streaming media (audio/video) server" TERMUX_PKG_VERSION=2.4.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.xiph.org/releases/icecast/icecast-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=c85ca48c765d61007573ee1406a797ae6cb31fb5961a42e7f1c87adb45ddc592 TERMUX_PKG_DEPENDS="libcurl, libgnutls, libogg, libvorbis, libxml2, libxslt, mime-support, openssl" diff --git a/packages/libflac/build.sh b/packages/libflac/build.sh index 65ba5979..7a3221d3 100644 --- a/packages/libflac/build.sh +++ b/packages/libflac/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://xiph.org/flac/ TERMUX_PKG_DESCRIPTION="FLAC (Free Lossless Audio Codec) library" TERMUX_PKG_VERSION=1.3.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz TERMUX_PKG_SHA256=4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c TERMUX_PKG_DEPENDS="libogg" diff --git a/packages/libmp3splt/build.sh b/packages/libmp3splt/build.sh index 1774fe7b..2137b562 100644 --- a/packages/libmp3splt/build.sh +++ b/packages/libmp3splt/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://mp3splt.sourceforge.net TERMUX_PKG_DESCRIPTION="Mp3Splt-project is a utility to split mp3, ogg vorbis and native FLAC files selecting a begin and an end time position, without decoding" TERMUX_PKG_VERSION=0.9.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://prdownloads.sourceforge.net/mp3splt/libmp3splt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=30eed64fce58cb379b7cc6a0d8e545579cb99d0f0f31eb00b9acc8aaa1b035dc TERMUX_PKG_DEPENDS="libmad, libid3tag, libvorbis, libflac, pcre, libtool" diff --git a/packages/liboggz/build.sh b/packages/liboggz/build.sh index 36e381ae..113995c8 100644 --- a/packages/liboggz/build.sh +++ b/packages/liboggz/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.xiph.org/oggz/ TERMUX_PKG_DESCRIPTION="Command and library to inspect, tweak, edit and validate Ogg files" TERMUX_PKG_VERSION=1.1.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/liboggz/liboggz-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=6bafadb1e0a9ae4ac83304f38621a5621b8e8e32927889e65a98706d213d415a TERMUX_PKG_DEPENDS="libogg" diff --git a/packages/libsndfile/Makefile.am.patch b/packages/libsndfile/Makefile.am.patch new file mode 100644 index 00000000..14f33286 --- /dev/null +++ b/packages/libsndfile/Makefile.am.patch @@ -0,0 +1,302 @@ +Temporary patch (to avoid having to install autogen) until 1.0.29 is released. + +diff -u -r ../libsndfile-826d5296da54c016e3cb0f7f00de3b9e295b9c4a/Makefile.am ./Makefile.am +--- ../libsndfile-826d5296da54c016e3cb0f7f00de3b9e295b9c4a/Makefile.am 2017-10-31 09:30:54.000000000 +0100 ++++ ./Makefile.am 2017-11-15 23:24:38.275420688 +0100 +@@ -30,18 +30,13 @@ + + test: check + +-# Need this target to force building of test programs. +-checkprograms: $(check_PROGRAMS) +- + ######## + # src/ # + ######## + +-BUILT_SOURCES = src/test_endswap.c +- + SYMBOL_FILES = src/Symbols.gnu-binutils src/Symbols.darwin src/libsndfile-1.def src/Symbols.os2 src/Symbols.static + +-EXTRA_DIST += src/sndfile.h.in src/config.h.in src/test_endswap.tpl src/test_endswap.def \ ++EXTRA_DIST += src/sndfile.h.in src/config.h.in \ + $(SYMBOL_FILES) src/create_symbols_file.py src/binheader_writef_check.py \ + src/GSM610/README src/GSM610/COPYRIGHT src/GSM610/ChangeLog \ + src/G72x/README src/G72x/README.original src/G72x/ChangeLog \ +@@ -80,13 +75,6 @@ + src/ima_oki_adpcm.c src/ima_oki_adpcm.h src/alac.c src/chunk.c src/ogg.c src/chanmap.c \ + src/windows.c src/id3.c $(WIN_VERSION_FILE) + +-check_PROGRAMS = src/test_main +-src_test_main_SOURCES = src/test_main.c src/test_main.h src/test_conversions.c src/test_float.c src/test_endswap.c \ +- src/test_audio_detect.c src/test_log_printf.c src/test_file_io.c src/test_ima_oki_adpcm.c \ +- src/test_strncpy_crlf.c src/test_broadcast_var.c src/test_cart_var.c \ +- src/test_binheader_writef.c +-src_test_main_LDADD = src/libcommon.la +- + ############## + # src/GSM610 # + ############## +@@ -106,7 +94,6 @@ + src_G72x_libg72x_la_SOURCES = src/G72x/g72x.h src/G72x/g72x_priv.h \ + src/G72x/g721.c src/G72x/g723_16.c src/G72x/g723_24.c src/G72x/g723_40.c src/G72x/g72x.c + +-check_PROGRAMS += src/G72x/g72x_test + src_G72x_g72x_test_SOURCES = src/G72x/g72x_test.c + src_G72x_g72x_test_LDADD = src/G72x/libg72x.la + +@@ -167,9 +154,6 @@ + # examples/ # + ############# + +-check_PROGRAMS += examples/make_sine examples/sfprocess examples/list_formats examples/generate examples/sndfilehandle \ +- examples/sndfile-to-text examples/sndfile-loopify +- + examples_sndfile_to_text_SOURCES = examples/sndfile-to-text.c + examples_sndfile_to_text_LDADD = src/libsndfile.la + +@@ -191,211 +175,6 @@ + examples_sndfilehandle_SOURCES = examples/sndfilehandle.cc + examples_sndfilehandle_LDADD = src/libsndfile.la + +-########## +-# tests/ # +-########## +- +-TESTS_ENVIRONMENT = $(SHELL) tests/test_wrapper.sh +- +-if ENABLE_TEST_COVERAGE +-CPP_TEST = +-else +-CPP_TEST = tests/cpp_test +-endif +- +-TESTS = tests/pedantic-header-test.sh +- +-check_PROGRAMS += tests/sfversion tests/floating_point_test tests/write_read_test \ +- tests/lossy_comp_test tests/error_test tests/ulaw_test tests/alaw_test tests/dwvw_test \ +- tests/peak_chunk_test tests/command_test tests/stdio_test \ +- tests/pcm_test tests/headerless_test tests/pipe_test tests/header_test tests/misc_test \ +- tests/raw_test tests/string_test tests/multi_file_test tests/chunk_test \ +- tests/scale_clip_test tests/win32_test tests/aiff_rw_test tests/virtual_io_test \ +- tests/locale_test tests/win32_ordinal_test tests/ogg_test tests/compression_size_test \ +- tests/checksum_test tests/external_libs_test tests/rdwr_test tests/format_check_test $(CPP_TEST) \ +- tests/channel_test tests/long_read_write_test tests/stdin_test tests/stdout_test \ +- tests/dither_test tests/fix_this tests/largefile_test tests/benchmark +- +-BUILT_SOURCES += \ +- tests/write_read_test.c \ +- tests/pcm_test.c \ +- tests/header_test.c \ +- tests/utils.c \ +- tests/scale_clip_test.c \ +- tests/pipe_test.c \ +- tests/rdwr_test.c \ +- tests/floating_point_test.c \ +- tests/benchmark.c +- +-EXTRA_DIST += $(BUILT_SOURCES) \ +- tests/write_read_test.tpl tests/write_read_test.def \ +- tests/pcm_test.tpl tests/pcm_test.def \ +- tests/header_test.tpl tests/header_test.def \ +- tests/utils.tpl tests/utils.def \ +- tests/scale_clip_test.tpl tests/scale_clip_test.def \ +- tests/pipe_test.tpl tests/pipe_test.def \ +- tests/rdwr_test.tpl tests/rdwr_test.def \ +- tests/floating_point_test.tpl tests/floating_point_test.def \ +- tests/benchmark.tpl tests/benchmark.def +- +-# If we're cross compiling from Linux to Windows and running the test suite +-# under Wine, we need a symbolic link to the generated libsndfile DLL. +- +-if LINUX_MINGW_CROSS_TEST +- +-$(check_PROGRAMS) : libsndfile-1.dll +- +-libsndfile-1.dll : +- $(LN_S) src/.libs/$@ $@ +- +-clean-local : +- -rm -f libsndfile-1.dll +- +-endif +- +-#=============================================================================== +- +-tests_sfversion_SOURCES = tests/sfversion.c +-tests_sfversion_LDADD = src/libsndfile.la +- +-tests_write_read_test_SOURCES = tests/utils.c tests/generate.c tests/generate.h tests/write_read_test.c tests/utils.h +-tests_write_read_test_LDADD = src/libsndfile.la +- +-tests_lossy_comp_test_SOURCES = tests/utils.c tests/lossy_comp_test.c tests/utils.h +-tests_lossy_comp_test_LDADD = src/libsndfile.la +- +-tests_fix_this_SOURCES = tests/utils.c tests/fix_this.c tests/utils.h +-tests_fix_this_LDADD = src/libsndfile.la +- +-tests_error_test_SOURCES = tests/error_test.c tests/utils.c tests/utils.h +-tests_error_test_LDADD = src/libsndfile.la +- +-tests_ulaw_test_SOURCES = tests/utils.c tests/ulaw_test.c tests/utils.h +-tests_ulaw_test_LDADD = src/libsndfile.la +- +-tests_alaw_test_SOURCES = tests/utils.c tests/alaw_test.c tests/utils.h +-tests_alaw_test_LDADD = src/libsndfile.la +- +-tests_aiff_rw_test_SOURCES = tests/utils.c tests/aiff_rw_test.c tests/utils.h +-tests_aiff_rw_test_LDADD = src/libsndfile.la +- +-tests_command_test_SOURCES = tests/command_test.c tests/utils.c tests/utils.h +-tests_command_test_LDADD = src/libsndfile.la +- +-tests_locale_test_SOURCES = tests/locale_test.c tests/utils.c tests/utils.h +-tests_locale_test_LDADD = src/libsndfile.la +- +-tests_largefile_test_SOURCES = tests/largefile_test.c tests/utils.c tests/utils.h +-tests_largefile_test_LDADD = src/libsndfile.la +- +-tests_pcm_test_SOURCES = tests/pcm_test.c tests/utils.c tests/utils.h +-tests_pcm_test_LDADD = src/libsndfile.la +- +-tests_headerless_test_SOURCES = tests/utils.c tests/headerless_test.c tests/utils.h +-tests_headerless_test_LDADD = src/libsndfile.la +- +-tests_stdin_test_SOURCES = tests/stdin_test.c tests/utils.c tests/utils.h +-tests_stdin_test_LDADD = src/libsndfile.la +- +-tests_stdout_test_SOURCES = tests/stdout_test.c tests/utils.h +-tests_stdout_test_LDADD = src/libsndfile.la +- +-tests_stdio_test_SOURCES = tests/stdio_test.c tests/utils.c tests/utils.h +-tests_stdio_test_LDADD = src/libsndfile.la +- +-tests_pipe_test_SOURCES = tests/pipe_test.c tests/utils.c tests/utils.h +-tests_pipe_test_LDADD = src/libsndfile.la +- +-tests_benchmark_SOURCES = tests/benchmark.c tests/utils.h +-tests_benchmark_LDADD = src/libsndfile.la +- +-tests_header_test_SOURCES = tests/header_test.c tests/utils.c tests/utils.h +-tests_header_test_LDADD = src/libsndfile.la +- +-tests_misc_test_SOURCES = tests/misc_test.c tests/utils.c tests/utils.h +-tests_misc_test_LDADD = src/libsndfile.la +- +-tests_raw_test_SOURCES = tests/raw_test.c tests/utils.c tests/utils.h +-tests_raw_test_LDADD = src/libsndfile.la +- +-tests_string_test_SOURCES = tests/string_test.c tests/utils.c tests/utils.h +-tests_string_test_LDADD = src/libsndfile.la +- +-tests_dither_test_SOURCES = tests/dither_test.c tests/utils.c tests/utils.h +-tests_dither_test_LDADD = src/libsndfile.la +- +-tests_chunk_test_SOURCES = tests/chunk_test.c tests/utils.c tests/utils.h +-tests_chunk_test_LDADD = src/libsndfile.la +- +-tests_multi_file_test_SOURCES = tests/multi_file_test.c tests/utils.c tests/utils.h +-tests_multi_file_test_LDADD = src/libsndfile.la +- +-tests_virtual_io_test_SOURCES = tests/virtual_io_test.c tests/utils.c tests/utils.h +-tests_virtual_io_test_LDADD = src/libsndfile.la +- +-tests_ogg_test_SOURCES = tests/ogg_test.c tests/utils.c tests/utils.h +-tests_ogg_test_LDADD = src/libsndfile.la +- +-tests_compression_size_test_SOURCES = tests/compression_size_test.c tests/utils.c tests/utils.h tests/dft_cmp.h +-tests_compression_size_test_LDADD = src/libsndfile.la +- +-tests_rdwr_test_SOURCES = tests/rdwr_test.c tests/utils.c tests/utils.h +-tests_rdwr_test_LDADD = src/libsndfile.la +- +-tests_win32_test_SOURCES = tests/win32_test.c +-# Link lib here so that generating the testsuite tarball works correctly. +-tests_win32_test_LDADD = src/libsndfile.la +- +-tests_win32_ordinal_test_SOURCES = tests/win32_ordinal_test.c tests/utils.c tests/utils.h +-tests_win32_ordinal_test_LDADD = src/libsndfile.la +- +-tests_external_libs_test_SOURCES = tests/external_libs_test.c tests/utils.c tests/utils.h +-tests_external_libs_test_LDADD = src/libsndfile.la +- +-tests_format_check_test_SOURCES = tests/format_check_test.c tests/utils.c tests/utils.h +-tests_format_check_test_LDADD = src/libsndfile.la +- +-tests_channel_test_SOURCES = tests/channel_test.c tests/utils.c tests/utils.h +-tests_channel_test_LDADD = src/libsndfile.la +- +-tests_long_read_write_test_SOURCES = tests/long_read_write_test.c tests/utils.c tests/utils.h tests/dft_cmp.h +-tests_long_read_write_test_LDADD = src/libsndfile.la +- +-tests_cpp_test_SOURCES = tests/cpp_test.cc tests/utils.c tests/utils.h +-tests_cpp_test_LDADD = src/libsndfile.la +- +-tests_checksum_test_SOURCES = tests/checksum_test.c tests/utils.c tests/utils.h +-tests_checksum_test_LDADD = src/libsndfile.la +- +-# Lite remove start +-tests_dwvw_test_SOURCES = tests/dwvw_test.c tests/utils.c tests/utils.h +-tests_dwvw_test_LDADD = src/libsndfile.la +- +-tests_floating_point_test_SOURCES = tests/utils.c tests/utils.h tests/dft_cmp.c tests/dft_cmp.h tests/floating_point_test.c +-tests_floating_point_test_LDADD = src/libsndfile.la +- +-tests_peak_chunk_test_SOURCES = tests/peak_chunk_test.c tests/utils.c tests/utils.h +-tests_peak_chunk_test_LDADD = src/libsndfile.la +- +-tests_scale_clip_test_SOURCES = tests/scale_clip_test.c tests/utils.c tests/utils.h +-tests_scale_clip_test_LDADD = src/libsndfile.la +-# Lite remove end +- +-#=============================================================================== +-# Autogen generated sources. +-# These GNU style rules actually work. The old style suffix rules do not. +- +-%.c : %.def %.tpl +- cd $(top_srcdir)/$(@D) && autogen --writable $( /dev/null 2>&1 || { +- echo +- echo "You must have GNU autogen installed to compile $package." +- echo "Download the appropriate package for your distribution," +- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" +- result="no" +- DIE=1 +-} +-echo $result +- + printf "checking for autoconf ... " + result="yes" + (autoconf --version) < /dev/null > /dev/null 2>&1 || { diff --git a/packages/libsndfile/build.sh b/packages/libsndfile/build.sh index 00f639f7..ef905c3c 100644 --- a/packages/libsndfile/build.sh +++ b/packages/libsndfile/build.sh @@ -1,8 +1,13 @@ TERMUX_PKG_HOMEPAGE=http://www.mega-nerd.com/libsndfile -# Await 1.0.29 for update which includes fix for Android build, -# https://github.com/erikd/libsndfile/issues/295 -TERMUX_PKG_VERSION=1.0.27 -TERMUX_PKG_SRCURL=http://www.mega-nerd.com/libsndfile/files/libsndfile-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 +TERMUX_PKG_DESCRIPTION="Library for reading/writing audio files" +# Use a git master snapshot until 1.0.29 is released: +TERMUX_PKG_VERSION=1.0.29~pre1 +TERMUX_PKG_SRCURL=https://github.com/erikd/libsndfile/archive/826d5296da54c016e3cb0f7f00de3b9e295b9c4a.zip +TERMUX_PKG_SHA256=84651201a8468c448f1fd172a48ccf47f3761d23fd0f59bcaaf908050e9eeb7c TERMUX_PKG_DEPENDS="libflac, libvorbis" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sqlite --disable-alsa" +TERMUX_PKG_RM_AFTER_INSTALL="bin/ share/man/man1/" + +termux_step_pre_configure () { + sh autogen.sh +} diff --git a/packages/libvorbis/build.sh b/packages/libvorbis/build.sh index d3a49e8b..aad4b3d9 100644 --- a/packages/libvorbis/build.sh +++ b/packages/libvorbis/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vorbis.com/ TERMUX_PKG_DESCRIPTION="Library for using the Ogg Vorbis compressed audio format" TERMUX_PKG_VERSION=1.3.5 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/vorbis/libvorbis-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 TERMUX_PKG_DEPENDS="libogg" diff --git a/packages/opus-tools/build.sh b/packages/opus-tools/build.sh index 4fe383d8..16e496bb 100644 --- a/packages/opus-tools/build.sh +++ b/packages/opus-tools/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.opus-codec.org/ TERMUX_PKG_DESCRIPTION="Utilities to encode and decode .opus files" TERMUX_PKG_VERSION=0.1.10 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/opus/opus-tools-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c TERMUX_PKG_DEPENDS="libopus, libogg, libflac" diff --git a/packages/sox/build.sh b/packages/sox/build.sh index 91adc65a..ab122143 100644 --- a/packages/sox/build.sh +++ b/packages/sox/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://sox.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Command line utility for converting between and applying effects to various audio files formats" TERMUX_PKG_VERSION=14.4.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/sox/sox/${TERMUX_PKG_VERSION}/sox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/vorbis-tools/build.sh b/packages/vorbis-tools/build.sh index ff00fd42..a749c2d7 100644 --- a/packages/vorbis-tools/build.sh +++ b/packages/vorbis-tools/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vorbis.com TERMUX_PKG_DESCRIPTION="Ogg Vorbis tools" TERMUX_PKG_VERSION=1.4.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/vorbis/vorbis-tools-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc # libflac for flac support in oggenc: -- 2.11.0