vorbis-tools: Use external gettext

Fixes build with gettext 0.20.x

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2019-12-31 19:26:27 -08:00
parent 48d782ed03
commit 91f53941b8
2 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,37 @@
Fix build with gettext 0.20.x
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = po intl include share debian win32 @OPT_SUBDIRS@
-DIST_SUBDIRS = po intl include share debian win32 ogg123 oggenc oggdec ogginfo \
+SUBDIRS = po include share debian win32 @OPT_SUBDIRS@
+DIST_SUBDIRS = po include share debian win32 ogg123 oggenc oggdec ogginfo \
vcut vorbiscomment m4
EXTRA_DIST = config.rpath README AUTHORS COPYING CHANGES vorbis-tools.spec config.h mkinstalldirs
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ CFLAGS="$cflags_save"
AC_PROG_LIBTOOL
ALL_LINGUAS="be cs da en_GB eo es fr hr hu nl pl ro ru sk sv uk vi"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
dnl --------------------------------------------------
dnl System checks
@@ -383,7 +383,6 @@ AC_OUTPUT([
Makefile
m4/Makefile
po/Makefile.in
-intl/Makefile
include/Makefile
share/Makefile
win32/Makefile

View File

@ -13,6 +13,7 @@ DEPENDS = "libogg libvorbis"
SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \
file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \
file://0004-Fix-format-error-blocking-compilation-with-hardening.patch \
file://gettext.patch \
"
SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6"