From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5889513835A for ; Wed, 25 Nov 2020 17:37:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2CFBE093E; Wed, 25 Nov 2020 17:37:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C2A2E093E for ; Wed, 25 Nov 2020 17:37:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB32734127A for ; Wed, 25 Nov 2020 17:37:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2942146B for ; Wed, 25 Nov 2020 17:37:53 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1606325852.938fc4a06b68c67f608333fd670bf05b97926ed3.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch net-misc/minidlna/minidlna-1.2.1-r1.ebuild X-VCS-Directories: net-misc/minidlna/ net-misc/minidlna/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 938fc4a06b68c67f608333fd670bf05b97926ed3 X-VCS-Branch: master Date: Wed, 25 Nov 2020 17:37:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 33d6f833-c90b-491d-a765-74ccea8b7b6b X-Archives-Hash: 1b1da2a4e2665b1262087708eb14e269 commit: 938fc4a06b68c67f608333fd670bf05b97926ed3 Author: Jakov Smolic sartura hr> AuthorDate: Wed Nov 25 17:37:32 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Nov 25 17:37:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938fc4a0 net-misc/minidlna: fix build with gcc-10 * Thanks to event event.riga gmail.com for submitting the original patch Closes: https://github.com/gentoo/gentoo/pull/18396 Closes: https://bugs.gentoo.org/706916 Closes: https://bugs.gentoo.org/715270 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> .../minidlna/files/minidlna-1.2.1-fno-common.patch | 45 ++++++++++++++++++++++ net-misc/minidlna/minidlna-1.2.1-r1.ebuild | 4 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch new file mode 100644 index 00000000000..5cca89b52db --- /dev/null +++ b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch @@ -0,0 +1,45 @@ +--- a/image_utils.c ++++ b/image_utils.c +@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf + src->pub.bytes_in_buffer = bufsize; + } + +-jmp_buf setjmp_buffer; ++static jmp_buf setjmp_buffer; + /* Don't exit on error like libjpeg likes to do */ + static void + libjpeg_error_handler(j_common_ptr cinfo) +--- a/metadata.c ++++ b/metadata.c +@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name) + } + + /* For libjpeg error handling */ +-jmp_buf setjmp_buffer; ++static jmp_buf setjmp_buffer; + static void + libjpeg_error_handler(j_common_ptr cinfo) + { +--- a/tivo_utils.c ++++ b/tivo_utils.c +@@ -27,6 +27,7 @@ + #include + #include "tivo_utils.h" + ++struct sqlite3PrngType sqlite3Prng; + /* This function based on byRequest */ + char * + decodeString(char *string, int inplace) +--- a/tivo_utils.h ++++ b/tivo_utils.h +@@ -30,7 +30,9 @@ struct sqlite3PrngType { + unsigned char isInit; /* True if initialized */ + unsigned char i, j; /* State variables */ + unsigned char s[256]; /* State variables */ +-} sqlite3Prng; ++}; ++ ++extern struct sqlite3PrngType sqlite3Prng; + + char * + decodeString(char *string, int inplace); diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild index 47ee6484cd2..9d6ba5c94f4 100644 --- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild +++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="amd64 arm x86" -IUSE="netgear readynas zeroconf" +IUSE="elibc_musl netgear readynas zeroconf" RDEPEND="dev-db/sqlite:3 media-libs/flac:= @@ -24,6 +24,7 @@ RDEPEND="dev-db/sqlite:3 media-libs/libvorbis:= media-video/ffmpeg:0= virtual/jpeg:0= + elibc_musl? ( sys-libs/queue-standalone ) zeroconf? ( net-dns/avahi:= )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -32,6 +33,7 @@ CONFIG_CHECK="~INOTIFY_USER" PATCHES=( "${WORKDIR}"/minidlna-gentoo-artwork.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() {