diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2020-11-25 18:37:32 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-11-25 18:37:32 +0100 |
| commit | 938fc4a06b68c67f608333fd670bf05b97926ed3 (patch) | |
| tree | bb9d7dd4ac6baa2007c9b1f6f8e7951f28b7532e | |
| parent | sys-block/cec: port to EAPI 7 (diff) | |
| download | gentoo-938fc4a06b68c67f608333fd670bf05b97926ed3.tar.gz gentoo-938fc4a06b68c67f608333fd670bf05b97926ed3.tar.bz2 gentoo-938fc4a06b68c67f608333fd670bf05b97926ed3.zip | |
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 <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
| -rw-r--r-- | net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch | 45 | ||||
| -rw-r--r-- | net-misc/minidlna/minidlna-1.2.1-r1.ebuild | 4 |
2 files changed, 48 insertions, 1 deletions
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 000000000000..5cca89b52db2 --- /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 <sqlite3.h> + #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 47ee6484cd27..9d6ba5c94f4b 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() { |