summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL. E. Segovia <amy@centricular.com>2024-02-28 13:37:14 -0300
committerL. E. Segovia <amy@centricular.com>2024-03-12 08:19:02 -0300
commit739e3fc98bb80a7f9c06ba1dbd60c5ccb204ea90 (patch)
treebe69b3c17bc2c435cb74a14e372f205dc052bf78
parent43f5b7bb97ba0ab4e2e3a0845904c94b472e4643 (diff)
libvorbis: Update to 1.3.7 and port to Meson
See #215 Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1389>
-rw-r--r--recipes/libvorbis.recipe27
-rw-r--r--recipes/libvorbis/0001-Add-Meson-build.patch349
-rw-r--r--recipes/libvorbis/0001-build-check-if-mno-ieee-fp-is-supported.patch41
-rw-r--r--recipes/libvorbis/0004-configure-check-for-endianness.patch45
-rw-r--r--recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch30
-rw-r--r--recipes/libvorbis/0006-Use-our-version-of-automake-instead-of-some-random-o.patch39
-rw-r--r--recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch27
7 files changed, 364 insertions, 194 deletions
diff --git a/recipes/libvorbis.recipe b/recipes/libvorbis.recipe
index 623e9129..b0c5501d 100644
--- a/recipes/libvorbis.recipe
+++ b/recipes/libvorbis.recipe
@@ -1,13 +1,14 @@
# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-from cerbero.utils import shell
+from cerbero.tools.libtool import LibtoolLibrary
class Recipe(recipe.Recipe):
name = 'libvorbis'
- version = '1.3.6'
+ version = '1.3.7'
stype = SourceType.TARBALL
+ btype = BuildType.MESON
url = 'xiph://vorbis/libvorbis-%(version)s.tar.xz'
- tarball_checksum = 'af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415'
+ tarball_checksum = 'b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b'
licenses = [{License.BSD_like: ['COPYING']}]
deps = ['libogg']
@@ -16,12 +17,14 @@ class Recipe(recipe.Recipe):
'include/vorbis', '%(libdir)s/pkgconfig/vorbis.pc',
'%(libdir)s/pkgconfig/vorbisenc.pc', '%(libdir)s/pkgconfig/vorbisfile.pc']
- def prepare(self):
- self.append_env('LDFLAGS', '-lm')
- if self.config.target_platform != Platform.WINDOWS:
- self.autoreconf = True
- self.patches += [
- 'libvorbis/0004-configure-check-for-endianness.patch',
- 'libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch',
- 'libvorbis/0001-build-check-if-mno-ieee-fp-is-supported.patch',
- ]
+ patches = [
+ # https://wrapdb.mesonbuild.com/v2/vorbis_1.3.7-4/get_patch
+ f'{name}/0001-Add-Meson-build.patch',
+ ]
+
+ def post_install(self):
+ LibtoolLibrary(self.name, 1, 3, 7,
+ self.config.libdir, self.config.target_platform,
+ deps=['ogg'],
+ static_only=self.library_type == LibraryType.STATIC).save()
+ super().post_install()
diff --git a/recipes/libvorbis/0001-Add-Meson-build.patch b/recipes/libvorbis/0001-Add-Meson-build.patch
new file mode 100644
index 00000000..a3f16428
--- /dev/null
+++ b/recipes/libvorbis/0001-Add-Meson-build.patch
@@ -0,0 +1,349 @@
+From 9a38c3c35d1296732783234cdd27f517b57128b6 Mon Sep 17 00:00:00 2001
+From: "L. E. Segovia" <amy@centricular.com>
+Date: Wed, 28 Feb 2024 13:28:49 -0300
+Subject: [PATCH 1/1] Add Meson build
+
+Source: https://wrapdb.mesonbuild.com/v2/vorbis_1.3.7-4/vorbis.wrap
+
+---
+ LICENSE.build | 19 +++++++++++
+ lib/meson.build | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
+ meson.build | 37 ++++++++++++++++++++
+ test/meson.build | 9 +++++
+ vorbis.def | 50 +++++++++++++++++++++++++++
+ vorbisenc.def | 10 ++++++
+ vorbisfile.def | 38 +++++++++++++++++++++
+ vq/meson.build | 20 +++++++++++
+ 8 files changed, 272 insertions(+)
+ create mode 100644 LICENSE.build
+ create mode 100644 lib/meson.build
+ create mode 100644 meson.build
+ create mode 100644 test/meson.build
+ create mode 100644 vorbis.def
+ create mode 100644 vorbisenc.def
+ create mode 100644 vorbisfile.def
+ create mode 100644 vq/meson.build
+
+diff --git a/LICENSE.build b/LICENSE.build
+new file mode 100644
+index 0000000..b59833d
+--- /dev/null
++++ b/LICENSE.build
+@@ -0,0 +1,19 @@
++Copyright (c) 2021 The Meson development team
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
+diff --git a/lib/meson.build b/lib/meson.build
+new file mode 100644
+index 0000000..e696aa1
+--- /dev/null
++++ b/lib/meson.build
+@@ -0,0 +1,89 @@
++vorbis_sources = [
++ 'analysis.c',
++ 'bitrate.c',
++ 'block.c',
++ 'codebook.c',
++ 'envelope.c',
++ 'floor0.c',
++ 'floor1.c',
++ 'info.c',
++ 'lookup.c',
++ 'lpc.c',
++ 'lsp.c',
++ 'mapping0.c',
++ 'mdct.c',
++ 'psy.c',
++ 'registry.c',
++ 'res0.c',
++ 'sharedbook.c',
++ 'smallft.c',
++ 'synthesis.c',
++ 'window.c',
++]
++
++vorbisfile_sources = ['vorbisfile.c']
++
++vorbisenc_sources = ['vorbisenc.c']
++
++math_dep = meson.get_compiler('c').find_library('m', required: false)
++pkgconfig = import('pkgconfig')
++
++vorbis_lib = library('vorbis', vorbis_sources,
++ include_directories : [incdir],
++ dependencies : [ogg_dep, math_dep],
++ vs_module_defs: '../vorbis.def',
++ version: lib_version,
++ soversion: lib_soversion,
++ install: true,
++)
++
++vorbis_dep = declare_dependency(link_with : vorbis_lib,
++ include_directories : incdir,
++ dependencies: [ogg_dep, math_dep])
++
++pkgconfig.generate(vorbis_lib,
++ description: 'vorbis is the primary Ogg Vorbis library',
++)
++
++vorbisfile_lib = library('vorbisfile', vorbisfile_sources,
++ include_directories : [incdir],
++ link_with: vorbis_lib,
++ dependencies : [ogg_dep, math_dep],
++ vs_module_defs: '../vorbisfile.def',
++ version: vorbisfile_version,
++ soversion: vorbisfile_soversion,
++ install: true,
++)
++
++vorbisfile_dep = declare_dependency(link_with : vorbisfile_lib,
++ include_directories : incdir)
++
++pkgconfig.generate(vorbisfile_lib,
++ description: 'vorbisfile is a library that provides a convenient high-level API for decoding and basic manipulation of all Vorbis I audio streams',
++)
++
++vorbisenc_lib = library('vorbisenc', vorbisenc_sources,
++ include_directories : [incdir],
++ link_with: vorbis_lib,
++ dependencies : [ogg_dep, math_dep],
++ vs_module_defs: '../vorbisenc.def',
++ version: vorbisenc_version,
++ soversion: vorbisenc_soversion,
++ install: true,
++)
++
++vorbisenc_dep = declare_dependency(link_with : vorbisenc_lib,
++ include_directories : incdir)
++
++pkgconfig.generate(vorbisenc_lib,
++ description: 'vorbisenc is a library that provides a convenient API for setting up an encoding environment using libvorbis',
++)
++
++test_sharedbook = executable('test_sharedbook', 'sharedbook.c',
++ c_args : '-D_V_SELFTEST',
++ include_directories : [incdir],
++ link_with : vorbis_lib,
++ dependencies: [ogg_dep, math_dep],
++)
++
++test('sharedbook', test_sharedbook)
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..8303343
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,37 @@
++project('vorbis', 'c', version : '1.3.7', license : 'bsd-style')
++
++ogg_dep = dependency('ogg')
++
++# configure.ac
++lib_current = 4
++lib_revision = 9
++lib_age = 4
++lib_soversion = lib_current - lib_age
++lib_version = '@0@.@1@.@2@'.format(lib_soversion, lib_age, lib_revision)
++
++file_lib_current = 6
++file_lib_revision = 8
++file_lib_age = 3
++vorbisfile_soversion = file_lib_current - file_lib_age
++vorbisfile_version = '@0@.@1@.@2@'.format(vorbisfile_soversion, file_lib_age, file_lib_revision)
++
++enc_lib_current = 2
++enc_lib_revision = 12
++enc_lib_age = 0
++vorbisenc_soversion = enc_lib_current - enc_lib_age
++vorbisenc_version = '@0@.@1@.@2@'.format(vorbisenc_soversion, enc_lib_age, enc_lib_revision)
++
++headers = files(
++ 'include/vorbis/codec.h',
++ 'include/vorbis/vorbisenc.h',
++ 'include/vorbis/vorbisfile.h'
++)
++install_headers(headers, subdir: 'vorbis')
++
++incdir = include_directories('include')
++subdir('lib')
++if host_machine.system() != 'windows'
++ # These don't seem to build on Windows.
++ subdir('vq')
++endif
++subdir('test')
+diff --git a/test/meson.build b/test/meson.build
+new file mode 100644
+index 0000000..29f807b
+--- /dev/null
++++ b/test/meson.build
+@@ -0,0 +1,9 @@
++c_args = meson.get_compiler('c').get_argument_syntax() == 'msvc' ? ['-D_USE_MATH_DEFINES'] : []
++
++testexe = executable('testbin',
++ 'util.c', 'write_read.c', 'test.c',
++ c_args: c_args,
++ dependencies : [vorbisenc_dep, vorbis_dep, ogg_dep],
++)
++
++test('vorbistest', testexe, timeout: 90)
+diff --git a/vorbis.def b/vorbis.def
+new file mode 100644
+index 0000000..de14385
+--- /dev/null
++++ b/vorbis.def
+@@ -0,0 +1,50 @@
++; vorbis.def
++;
++EXPORTS
++_floor_P
++_mapping_P
++_residue_P
++;
++vorbis_info_init
++vorbis_info_clear
++vorbis_info_blocksize
++;
++vorbis_comment_init
++vorbis_comment_add
++vorbis_comment_add_tag
++vorbis_comment_query
++vorbis_comment_query_count
++vorbis_comment_clear
++;
++vorbis_block_init
++vorbis_block_clear
++vorbis_dsp_clear
++vorbis_granule_time
++;
++vorbis_analysis_init
++vorbis_commentheader_out
++vorbis_analysis_headerout
++vorbis_analysis_buffer
++vorbis_analysis_wrote
++vorbis_analysis_blockout
++vorbis_analysis
++vorbis_bitrate_addblock
++vorbis_bitrate_flushpacket
++;
++vorbis_synthesis_headerin
++vorbis_synthesis_init
++vorbis_synthesis_restart
++vorbis_synthesis
++vorbis_synthesis_trackonly
++vorbis_synthesis_blockin
++vorbis_synthesis_pcmout
++vorbis_synthesis_lapout
++vorbis_synthesis_read
++vorbis_packet_blocksize
++vorbis_synthesis_halfrate
++vorbis_synthesis_halfrate_p
++vorbis_synthesis_idheader
++;
++vorbis_window
++;_analysis_output_always
++vorbis_version_string
+diff --git a/vorbisenc.def b/vorbisenc.def
+new file mode 100644
+index 0000000..5d7b102
+--- /dev/null
++++ b/vorbisenc.def
+@@ -0,0 +1,10 @@
++; vorbisenc.def
++;
++EXPORTS
++vorbis_encode_init
++vorbis_encode_setup_managed
++vorbis_encode_setup_vbr
++vorbis_encode_init_vbr
++vorbis_encode_setup_init
++vorbis_encode_ctl
++
+diff --git a/vorbisfile.def b/vorbisfile.def
+new file mode 100644
+index 0000000..243795d
+--- /dev/null
++++ b/vorbisfile.def
+@@ -0,0 +1,38 @@
++; vorbisfile.def
++;
++EXPORTS
++ov_clear
++ov_open
++ov_open_callbacks
++ov_bitrate
++ov_bitrate_instant
++ov_streams
++ov_seekable
++ov_serialnumber
++ov_raw_total
++ov_pcm_total
++ov_time_total
++ov_raw_seek
++ov_pcm_seek
++ov_pcm_seek_page
++ov_time_seek
++ov_time_seek_page
++ov_raw_seek_lap
++ov_pcm_seek_lap
++ov_pcm_seek_page_lap
++ov_time_seek_lap
++ov_time_seek_page_lap
++ov_raw_tell
++ov_pcm_tell
++ov_time_tell
++ov_info
++ov_comment
++ov_read
++ov_read_float
++ov_test
++ov_test_callbacks
++ov_test_open
++ov_crosslap
++ov_halfrate
++ov_halfrate_p
++ov_fopen
+diff --git a/vq/meson.build b/vq/meson.build
+new file mode 100644
+index 0000000..67e1812
+--- /dev/null
++++ b/vq/meson.build
+@@ -0,0 +1,20 @@
++latticebuild = executable('latticebuild',
++ 'latticebuild.c',
++ 'vqgen.c',
++ 'bookutil.c',
++ dependencies : vorbis_dep,
++)
++
++latticetune = executable('latticetune',
++ 'latticetune.c',
++ 'vqgen.c',
++ 'bookutil.c',
++ dependencies : vorbis_dep,
++)
++
++huffbuild = executable('huffbuild',
++ 'huffbuild.c',
++ 'vqgen.c',
++ 'bookutil.c',
++ dependencies : vorbis_dep,
++)
+--
+2.42.0.windows.2
+
diff --git a/recipes/libvorbis/0001-build-check-if-mno-ieee-fp-is-supported.patch b/recipes/libvorbis/0001-build-check-if-mno-ieee-fp-is-supported.patch
deleted file mode 100644
index c682fbc8..00000000
--- a/recipes/libvorbis/0001-build-check-if-mno-ieee-fp-is-supported.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5c3cd7bd791bc62ee18254ef5f4c9b03498426f9 Mon Sep 17 00:00:00 2001
-From: Matthew Waters <matthew@centricular.com>
-Date: Mon, 29 Oct 2018 00:24:46 +1100
-Subject: [PATCH] build: check if -mno-ieee-fp is supported
-
-e.g. it is not supported by clang
-
-https://llvm.org/bugs/show_bug.cgi?id=25615
----
- configure.ac | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 469f880..bdf774b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,9 +133,19 @@ else
- case $host in
- *86-*-linux*)
- DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
-- CFLAGS="-O3 -Wall -Wextra -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+ CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
- # PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
-- PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-+ PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline"
-+ AC_MSG_CHECKING([if gcc supports -mno-ieee-fp])
-+ old_cflags="$CFLAGS"
-+ CFLAGS="$CFLAGS -mno-ieee-fp"
-+ AC_TRY_COMPILE(, [return 0;], [
-+ AC_MSG_RESULT([yes])
-+ PROFILE="$PROFILE -mno-ieee-fp"
-+ ], [
-+ AC_MSG_RESULT([no])
-+ CFLAGS="$old_cflags"
-+ ])
-
- # glibc < 2.1.3 has a serious FP bug in the math inline header
- # that will cripple Vorbis. Look to see if the magic FP stack
---
-2.19.0
-
diff --git a/recipes/libvorbis/0004-configure-check-for-endianness.patch b/recipes/libvorbis/0004-configure-check-for-endianness.patch
deleted file mode 100644
index fc7a1870..00000000
--- a/recipes/libvorbis/0004-configure-check-for-endianness.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From eb862e6fb78a783e12061b771f8db9bab786e25c Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Fri, 19 Apr 2013 19:32:43 -0300
-Subject: [PATCH 4/4] configure: check for endianness
-
----
- configure.ac | 2 ++
- lib/os.h | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 55eccdb..953107d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -222,6 +222,8 @@ dnl --------------------------------------------------
-
- AC_CHECK_HEADER(memory.h,CFLAGS="$CFLAGS -DUSE_MEMORY_H",:)
-
-+AC_CHECK_HEADERS(endian.h machine/endian.h sys/param.h inttypes.h)
-+
- dnl --------------------------------------------------
- dnl Check for typedefs, structures, etc
- dnl --------------------------------------------------
-diff --git a/lib/os.h b/lib/os.h
-index 276b4de..f9fae9e 100644
---- a/lib/os.h
-+++ b/lib/os.h
-@@ -21,6 +21,14 @@
- #include "config.h"
- #endif
-
-+#if HAVE_ENDIAN_H
-+#include <endian.h>
-+#elif HAVE_MACHINE_ENDIAN_H
-+#include <machine/endian.h>
-+#elif HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
- #include <math.h>
- #include <ogg/os_types.h>
-
---
-1.8.4
-
diff --git a/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch b/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch
deleted file mode 100644
index b0fd55ba..00000000
--- a/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9feb6354cf8322a3a9cb89077a300bc61858dba2 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Mon, 4 Nov 2013 12:15:10 +0100
-Subject: [PATCH] darwin: do not build for a generic arm architecture
-
-These linker flags end up building for generic arm when armv7 is required
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 923eefe..4bf75a0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -197,9 +197,9 @@ else
- CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
- PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
- *-*-darwin*)
-- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
-- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
-- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
-+ DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
-+ CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
-+ PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
- *-*-os2*)
- # Use -W instead of -Wextra because gcc on OS/2 is an old version.
- DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
---
-2.1.0
-
diff --git a/recipes/libvorbis/0006-Use-our-version-of-automake-instead-of-some-random-o.patch b/recipes/libvorbis/0006-Use-our-version-of-automake-instead-of-some-random-o.patch
deleted file mode 100644
index bc931f06..00000000
--- a/recipes/libvorbis/0006-Use-our-version-of-automake-instead-of-some-random-o.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e5fe93640e77dab1902ded867edd6b6acf80ad06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Wed, 6 Nov 2013 10:48:00 +0100
-Subject: [PATCH] Use our version of automake instead of some random older
- version
-
----
- autogen.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index 0aca638..e605da8 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -47,8 +47,8 @@ if test -r Makefile.am; then
- echo -n "checking for automake $AM_NEEDED or later... "
- majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ`
- minneeded=`echo $AM_NEEDED | $VERSIONMKMIN`
-- for am in automake-$AM_NEEDED automake$AM_NEEDED \
-- automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake; do
-+ for am in automake automake-$AM_NEEDED automake$AM_NEEDED \
-+ automake-1.10 automake-1.9 automake-1.8 automake-1.7; do
- ($am --version < /dev/null > /dev/null 2>&1) || continue
- ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP`
- maj=`echo $ver | $VERSIONMKMAJ`
-@@ -61,8 +61,8 @@ if test -r Makefile.am; then
- done
- test -z $AUTOMAKE && echo "no"
- echo -n "checking for aclocal $AM_NEEDED or later... "
-- for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \
-- aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal-1.7 aclocal; do
-+ for ac in aclocal aclocal-$AM_NEEDED aclocal$AM_NEEDED \
-+ aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal-1.7; do
- ($ac --version < /dev/null > /dev/null 2>&1) || continue
- ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP`
- maj=`echo $ver | $VERSIONMKMAJ`
---
-1.8.4.2
-
diff --git a/recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch b/recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch
deleted file mode 100644
index dc971565..00000000
--- a/recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fa7893ac074b42229464cc009251628ad25821b7 Mon Sep 17 00:00:00 2001
-From: Edward Hervey <bilboed@bilboed.com>
-Date: Tue, 7 Apr 2015 10:16:15 +0200
-Subject: [PATCH] autogen.sh: Make sure libtoolize runs fully
-
----
- autogen.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index e605da8..4f77601 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -116,8 +116,8 @@ echo "Generating configuration files for $package, please wait...."
-
- echo " $ACLOCAL $ACLOCAL_FLAGS"
- $ACLOCAL $ACLOCAL_FLAGS || exit 1
--echo " $LIBTOOLIZE --automake"
--$LIBTOOLIZE --automake || exit 1
-+echo " $LIBTOOLIZE --automake --force"
-+$LIBTOOLIZE --automake --force || exit 1
- echo " autoheader"
- autoheader || exit 1
- echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
---
-2.1.0
-