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 37BBE13835A for ; Sat, 28 Nov 2020 00:38:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55BACE07FA; Sat, 28 Nov 2020 00:38:51 +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 2C327E07FA for ; Sat, 28 Nov 2020 00:38:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0271E341467 for ; Sat, 28 Nov 2020 00:38:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A42A546E for ; Sat, 28 Nov 2020 00:38:48 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1606523925.29047515f406f1f702903206843efc2e51cf538a.mgorny@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/Manifest net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch net-misc/minidlna/minidlna-1.3.0.ebuild X-VCS-Directories: net-misc/minidlna/ net-misc/minidlna/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 29047515f406f1f702903206843efc2e51cf538a X-VCS-Branch: master Date: Sat, 28 Nov 2020 00:38:48 +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: 41755207-3704-4159-a120-fff875c8c1ea X-Archives-Hash: c531156d2250db88402b171c384bf91b commit: 29047515f406f1f702903206843efc2e51cf538a Author: Michał Górny gentoo org> AuthorDate: Sat Nov 28 00:24:45 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 28 00:38:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29047515 net-misc/minidlna: Bump to 1.3.0 Signed-off-by: Michał Górny gentoo.org> net-misc/minidlna/Manifest | 1 + .../minidlna/files/minidlna-1.3.0-fno-common.patch | 23 +++++ net-misc/minidlna/minidlna-1.3.0.ebuild | 101 +++++++++++++++++++++ 3 files changed, 125 insertions(+) diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index 3ea400075f2..cea7e6981c0 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,2 +1,3 @@ DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b +DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch new file mode 100644 index 00000000000..50da196377f --- /dev/null +++ b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch @@ -0,0 +1,23 @@ +--- 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.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild new file mode 100644 index 00000000000..518b2f03944 --- /dev/null +++ b/net-misc/minidlna/minidlna-1.3.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="DLNA/UPnP-AV compliant media server" +HOMEPAGE="https://sourceforge.net/projects/minidlna/" +SRC_URI=" + https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz + https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="elibc_musl netgear readynas zeroconf" + +RDEPEND=" + acct-group/minidlna + acct-user/minidlna + dev-db/sqlite:3 + media-libs/flac:= + media-libs/libexif:= + media-libs/libid3tag:= + media-libs/libogg:= + media-libs/libvorbis:= + media-video/ffmpeg:0= + virtual/jpeg:0= + elibc_musl? ( sys-libs/queue-standalone ) + zeroconf? ( net-dns/avahi:= )" +DEPEND=${RDEPEND} +BDEPEND=" + virtual/pkgconfig" + +CONFIG_CHECK="~INOTIFY_USER" + +PATCHES=( + "${WORKDIR}"/minidlna-gentoo-artwork.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_prepare() { + sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \ + -e "/db_dir/s:/var/cache/:/var/lib/:" \ + -i minidlna.conf || die + + default +} + +src_configure() { + local myconf=( + --with-db-path=/var/lib/minidlna + --with-log-path=/var/log/minidlna + --enable-tivo + $(use_enable netgear) + $(use_enable readynas) + ) + use zeroconf || myconf+=( + ac_cv_lib_avahi_client_avahi_threaded_poll_new=no + ) + + econf "${myconf[@]}" +} + +src_test() { + : +} + +src_install() { + default + + #bug 536532 + dosym ../sbin/minidlnad /usr/bin/minidlna + + insinto /etc + doins minidlna.conf + + newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna + newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna + systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service + newtmpfiles - minidlna.conf <<-EOF + d /run/minidlna 0755 minidlna minidlna - + EOF + + keepdir /var/{lib,log}/minidlna + + doman minidlnad.8 minidlna.conf.5 +} + +pkg_preinst() { + local my_is_new=yes + [[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no + + fowners minidlna:minidlna /var/{lib,log}/minidlna + fperms 0750 /var/{lib,log}/minidlna +} + +pkg_postinst() { + tmpfiles_process minidlna.conf +}