minidlna: exclude "po" directory to fix CONFIG_BUILD_NLS=y builds

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 <rafal@milecki.pl>

diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index f6c9be4f0ac96703f6a5588122ed1781596cc6fb..3493528f00c901ddf725d9867b269312873c8c5a 100644 (file)
--- 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 (file)
index 0000000..0ff4e93
--- /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 59245998cc6319c9ff9610df732a4985d49c9bba..cc6265171ce35a728fe5cd35c77f724501c511ac 100644 (file)
--- 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;
        }