diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-30 13:28:21 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-30 22:22:18 +0530 |
| commit | 6ed00df103cb745e7812315c1fad63c4ef70b9e9 (patch) | |
| tree | 8a233da261c412f31c6712920490c5d793caf2de /recipes/libvorbis | |
| parent | f111503d20ae56254222b88eca1656ec2ddf1e22 (diff) | |
recipes: Try to eliminate autoreconf as much as possible on Windows
autom4te seems to hang on the Windows CI runners because it needs to
use the ancient MSYS perl, so try to eliminate it and see if it helps.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/616>
Diffstat (limited to 'recipes/libvorbis')
| -rw-r--r-- | recipes/libvorbis/0001-Fix-linking-on-Android.patch | 25 | ||||
| -rw-r--r-- | recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch | 30 |
2 files changed, 0 insertions, 55 deletions
diff --git a/recipes/libvorbis/0001-Fix-linking-on-Android.patch b/recipes/libvorbis/0001-Fix-linking-on-Android.patch deleted file mode 100644 index 2ad77a58..00000000 --- a/recipes/libvorbis/0001-Fix-linking-on-Android.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c4251f892bbcaf47f1d20b3ce1664363ff08467a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> -Date: Wed, 22 Aug 2012 15:45:05 +0200 -Subject: [PATCH 1/4] Fix linking on Android - ---- - lib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 50f7ea4..d095eab 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -16,7 +16,7 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c \ - registry.h scales.h window.h lookup.h lookup_data.h\ - codec_internal.h backends.h bitrate.h - libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ --libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ -+libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ -lm - - libvorbisfile_la_SOURCES = vorbisfile.c - libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@ --- -1.8.4 - diff --git a/recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch b/recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch deleted file mode 100644 index 3eb9b4a6..00000000 --- a/recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 279c222e59caec8b315277938b56d3f3a51a319c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> -Date: Wed, 22 Aug 2012 15:50:12 +0200 -Subject: [PATCH 3/4] Link the other libs with -lm too - ---- - lib/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index d095eab..87f35fc 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -20,11 +20,11 @@ libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ -lm - - libvorbisfile_la_SOURCES = vorbisfile.c - libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@ --libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -+libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm - - libvorbisenc_la_SOURCES = vorbisenc.c - libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@ --libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@ -+libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm - - EXTRA_PROGRAMS = barkmel tone psytune - CLEANFILES = $(EXTRA_PROGRAMS) --- -1.8.4 - |