From 90d3ef2f76338f78101dd05c0ee171c4e1e3df55 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 19 Feb 2018 12:43:14 +0100 Subject: [PATCH] minidlna: exclude "po" directory to fix CONFIG_BUILD_NLS=y builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.19 Makefile of minidlna package specifies PKG_FIXUP:=autoreconf. That results in calling autoreconf with multiple arguments, including many -I ones. One of autoreconf steps is calling aclocal with the same set of -I arguments. All of that results in: 1) aclocal using staging_dir's /usr/share/aclocal and its po.m4 2) not using minidlna's po.m4 3) not updating Makefile.in.in If staging_dir's po.m4 has different GETTEXT_MACRO_VERSION than the minidlna's one it'll result in a mismatch in the Makefile.in. Ideally we should take care of regenerating Makefile.in.in but this isn't currentlly supported. As localization isn't properly supported anyway (no shipping .mo files) it's safe to just disable building po files. Added patch comes from the master branch commit d5fcc972ba57d ("multimedia/minidlna: Update to 1.2.0"). Fixes: 72928442614d9 ("minidlna: backport fixes from 1.1.6 and 1.2.0 releases") Signed-off-by: Rafał Miłecki --- multimedia/minidlna/Makefile | 2 +- .../patches/008-dont-build-po-files.patch | 25 +++++++++++++++++++ .../minidlna/patches/010-libav-fix.patch | 4 +-- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 multimedia/minidlna/patches/008-dont-build-po-files.patch diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index f6c9be4f0a..3493528f00 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minidlna PKG_VERSION:=1.1.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/minidlna diff --git a/multimedia/minidlna/patches/008-dont-build-po-files.patch b/multimedia/minidlna/patches/008-dont-build-po-files.patch new file mode 100644 index 0000000000..0ff4e93c67 --- /dev/null +++ b/multimedia/minidlna/patches/008-dont-build-po-files.patch @@ -0,0 +1,25 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,7 +17,7 @@ + + AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 @STATIC_CFLAGS@ + +-SUBDIRS=po ++SUBDIRS= + + sbin_PROGRAMS = minidlnad + check_PROGRAMS = testupnpdescgen +--- a/configure.ac ++++ b/configure.ac +@@ -634,6 +634,8 @@ case "$target_os" in + esac + + +-AC_OUTPUT([ po/Makefile.in +-Makefile +-]) ++# AC_OUTPUT([ po/Makefile.in ++# Makefile ++# ]) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT diff --git a/multimedia/minidlna/patches/010-libav-fix.patch b/multimedia/minidlna/patches/010-libav-fix.patch index 59245998cc..cc6265171c 100644 --- a/multimedia/minidlna/patches/010-libav-fix.patch +++ b/multimedia/minidlna/patches/010-libav-fix.patch @@ -1,6 +1,6 @@ --- a/libav.h +++ b/libav.h -@@ -167,7 +167,7 @@ +@@ -167,7 +167,7 @@ lav_get_interlaced(AVCodecContext *vc, A static inline int lav_is_thumbnail_stream(AVStream *s, uint8_t **data, int *size) { @@ -9,7 +9,7 @@ if (s->disposition & AV_DISPOSITION_ATTACHED_PIC && s->codec->codec_id == AV_CODEC_ID_MJPEG) { -@@ -177,6 +177,6 @@ +@@ -177,6 +177,6 @@ lav_is_thumbnail_stream(AVStream *s, uin *size = s->attached_pic.size; return 1; } -- 2.30.2