* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2016-02-23 20:36 Michael Weber
0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2016-02-23 20:36 UTC (permalink / raw
To: gentoo-commits
commit: 944a94cacf7df1c8179eabcbe6d24640ea06bae1
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 20:30:09 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 20:35:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944a94ca
net-misc/minidlna: Revbump to new init script (https://github.com/gentoo/gentoo/pull/137, thanks jirutka).
Package-Manager: portage-2.2.27
net-misc/minidlna/files/minidlna-1.1.5.initd | 33 ++++++++++
net-misc/minidlna/minidlna-1.1.5-r1.ebuild | 96 ++++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/net-misc/minidlna/files/minidlna-1.1.5.initd b/net-misc/minidlna/files/minidlna-1.1.5.initd
new file mode 100644
index 0000000..c4cb33f
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.5.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+: ${CONFIG:=/etc/minidlna.conf}
+: ${M_USER:=minidlna}
+: ${M_GROUP:=minidlna}
+
+name="MiniDLNA"
+
+pidfile="/run/minidlna/minidlna.pid"
+command="/usr/sbin/minidlnad"
+command_args="-P $pidfile -f $CONFIG"
+start_stop_daemon_args="--user ${M_USER}:${M_GROUP}"
+
+required_files="$CONFIG"
+
+depend() {
+ need net
+}
+
+start_pre() {
+ if [ "$M_USER" = "root" ]; then
+ eerror "It's not a good idea to run minidlna as root!"
+ fi
+
+ if yesno "$RESCAN"; then
+ command_args="$command_args -R"
+ fi
+
+ checkpath -q -d -m 0750 -o "${M_USER}:${M_GROUP}" "$(dirname "$pidfile")"
+}
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
new file mode 100644
index 0000000..877534e
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+ media-libs/flac
+ media-libs/libexif
+ media-libs/libid3tag
+ media-libs/libogg
+ media-libs/libvorbis
+ virtual/ffmpeg
+ virtual/jpeg:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+ local my_is_new="yes"
+ [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+ # created by above enewuser command w/ wrong group and permissions
+ chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+ chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+ # if user already exists, but /var/lib/minidlna is missing
+ # rely on ${D}/var/lib/minidlna created in src_install
+ fi
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+ -e "/db_dir/s:/var/cache/:/var/lib/:" \
+ -i ${PN}.conf || die
+
+ epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ --disable-silent-rules \
+ --with-db-path=/var/lib/${PN} \
+ --with-log-path=/var/log/${PN} \
+ --enable-tivo \
+ $(use_enable netgear) \
+ $(use_enable readynas)
+}
+
+src_install() {
+ default
+
+ #bug 536532
+ dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+ insinto /etc
+ doins ${PN}.conf
+
+ newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
+ systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+ echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+ systemd_dotmpfilesd "${T}"/${PN}.conf
+
+ dodir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+
+ dodoc AUTHORS NEWS README TODO
+ doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+ elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+ elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+ elog "cache is moved to /var/lib/minidlna."
+ elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2017-03-19 14:41 Michael Weber
0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2017-03-19 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 602d60245ccc9cb24d4268f25a95e7a8b78bbc80
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 11:56:34 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 14:38:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602d6024
net-misc/minidlna: Remove old versions.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
net-misc/minidlna/Manifest | 1 -
net-misc/minidlna/files/minidlna-1.1.2.initd | 52 ---------------
net-misc/minidlna/minidlna-1.1.4.ebuild | 92 ---------------------------
net-misc/minidlna/minidlna-1.1.5.ebuild | 95 ----------------------------
4 files changed, 240 deletions(-)
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index c7c7c446b37..03aab3c3ce4 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,3 +1,2 @@
-DIST minidlna-1.1.4.tar.gz 494478 SHA256 9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314 SHA512 24c2d82222798278d60faa46c6d7b19e44a91868da869f7d2aa2bf3c68e343a6c2a323f67223ea69242919047b08f059ed9c7a49b0b516384244acd98b51db4e WHIRLPOOL 5f82dd2130086e90784b05d67037e9c40e20b539ddc1bfb3733910beee44578027d9c245aa1f6117ba05b3c039a2b32125ea561f71c63cf0e422664e7067007f
DIST minidlna-1.1.5.tar.gz 488191 SHA256 8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa WHIRLPOOL 8ed8fd62fb063b042a234c8647fa05c65e4f1e331a66efae8f361002f5cedcd2706d777348332075e3263e0d8bbde7794dd84fc400dfe3a656e5d70952427669
DIST minidlna-gentoo-artwork.patch.xz 49372 SHA256 37ae7228b07b7c81c8962c5dc88a41ed1691bdf1b019b654a9fc93ac1da0c7ce SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e WHIRLPOOL e243b9b6a002af5e3ee1bb196239790ff86724624ebccb34c84ac072426341db6b5f44e455d13657d5284220fe2688ddf3a2ec0212a7b86525eb02a6c080af80
diff --git a/net-misc/minidlna/files/minidlna-1.1.2.initd b/net-misc/minidlna/files/minidlna-1.1.2.initd
deleted file mode 100644
index eeb0786f0b5..00000000000
--- a/net-misc/minidlna/files/minidlna-1.1.2.initd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting MiniDLNA"
- local params=""
- local stop=0
-
- checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /run/minidlna
-
- params="$params -P /run/minidlna/minidlna.pid"
-
- if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
- params="$params -R"
- fi
-
- #set the config file and check if it exists
- if [ -z "${CONFIG}" ]; then
- if [ ! -f "/etc/minidlna.conf" ]; then
- ewarn "You did not set the config file correctly"
- stop=1
- fi
- params="$params -f /etc/minidlna.conf"
- else
- if [ ! -f "${CONFIG}" ]; then
- ewarn "The specified config file does not exist"
- stop=1
- fi
- params="$params -f ${CONFIG}"
- fi
-
-
- if [ $stop -eq 1 ]; then
- eend 1
- else
- start-stop-daemon --start \
- --user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna} \
- --exec /usr/sbin/minidlnad -- ${params}
- eend $?
- fi
-}
-
-stop() {
- ebegin "Stopping MiniDLNA"
- start-stop-daemon --stop --quiet --exec /usr/sbin/minidlnad
- eend $?
-}
diff --git a/net-misc/minidlna/minidlna-1.1.4.ebuild b/net-misc/minidlna/minidlna-1.1.4.ebuild
deleted file mode 100644
index 0f2ebcd6d92..00000000000
--- a/net-misc/minidlna/minidlna-1.1.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
- https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="netgear readynas"
-
-RDEPEND="dev-db/sqlite:3
- media-libs/flac
- media-libs/libexif
- media-libs/libid3tag
- media-libs/libogg
- media-libs/libvorbis
- virtual/ffmpeg
- virtual/jpeg:0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
- local my_is_new="yes"
- [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
- # created by above enewuser command w/ wrong group and permissions
- chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
- chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
- # if user already exists, but /var/lib/minidlna is missing
- # rely on ${D}/var/lib/minidlna created in src_install
- fi
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
- -e "/db_dir/s:/var/cache/:/var/lib/:" \
- -i ${PN}.conf || die
-
- epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
-
- epatch_user
-}
-
-src_configure() {
- econf \
- --disable-silent-rules \
- --with-db-path=/var/lib/${PN} \
- --with-log-path=/var/log/${PN} \
- --enable-tivo \
- $(use_enable netgear) \
- $(use_enable readynas)
-}
-
-src_install() {
- default
-
- insinto /etc
- doins ${PN}.conf
-
- newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
- newinitd "${FILESDIR}"/${PN}-1.1.2.initd ${PN}
- systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
- echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
- systemd_dotmpfilesd "${T}"/${PN}.conf
-
- dodir /var/{lib,log}/${PN}
- fowners ${PN}:${PN} /var/{lib,log}/${PN}
- fperms 0750 /var/{lib,log}/${PN}
-
- dodoc AUTHORS NEWS README TODO
- doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
- elog "minidlna now runs as minidlna:minidlna (bug 426726),"
- elog "logfile is moved to /var/log/minidlna/minidlna.log,"
- elog "cache is moved to /var/lib/minidlna."
- elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.1.5.ebuild b/net-misc/minidlna/minidlna-1.1.5.ebuild
deleted file mode 100644
index 7e920f95490..00000000000
--- a/net-misc/minidlna/minidlna-1.1.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
- https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="netgear readynas"
-
-RDEPEND="dev-db/sqlite:3
- media-libs/flac
- media-libs/libexif
- media-libs/libid3tag
- media-libs/libogg
- media-libs/libvorbis
- virtual/ffmpeg
- virtual/jpeg:0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
- local my_is_new="yes"
- [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
- # created by above enewuser command w/ wrong group and permissions
- chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
- chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
- # if user already exists, but /var/lib/minidlna is missing
- # rely on ${D}/var/lib/minidlna created in src_install
- fi
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
- -e "/db_dir/s:/var/cache/:/var/lib/:" \
- -i ${PN}.conf || die
-
- epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
-
- epatch_user
-}
-
-src_configure() {
- econf \
- --disable-silent-rules \
- --with-db-path=/var/lib/${PN} \
- --with-log-path=/var/log/${PN} \
- --enable-tivo \
- $(use_enable netgear) \
- $(use_enable readynas)
-}
-
-src_install() {
- default
-
- #bug 536532
- dosym /usr/sbin/${PN}d /usr/bin/${PN}
-
- insinto /etc
- doins ${PN}.conf
-
- newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
- newinitd "${FILESDIR}"/${PN}-1.1.2.initd ${PN}
- systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
- echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
- systemd_dotmpfilesd "${T}"/${PN}.conf
-
- dodir /var/{lib,log}/${PN}
- fowners ${PN}:${PN} /var/{lib,log}/${PN}
- fperms 0750 /var/{lib,log}/${PN}
-
- dodoc AUTHORS NEWS README TODO
- doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
- elog "minidlna now runs as minidlna:minidlna (bug 426726),"
- elog "logfile is moved to /var/log/minidlna/minidlna.log,"
- elog "cache is moved to /var/lib/minidlna."
- elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2019-04-07 7:27 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2019-04-07 7:27 UTC (permalink / raw
To: gentoo-commits
commit: e80b5179de2a49355d5acb15e651a05e0d5c1654
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 07:12:10 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 07:27:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80b5179
net-misc/minidlna: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-misc/minidlna/Manifest | 1 -
.../files/minidlna-1.2.1-buildsystem.patch | 20 -----
net-misc/minidlna/minidlna-1.1.5-r1.ebuild | 95 --------------------
net-misc/minidlna/minidlna-1.2.1.ebuild | 100 ---------------------
4 files changed, 216 deletions(-)
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 97f34707209..3ea400075f2 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,3 +1,2 @@
-DIST minidlna-1.1.5.tar.gz 488191 BLAKE2B bda7d9099a11578919387f6d4f0e04c162556fb3557352446f0e7c69ee7dfe8f2c19d002b3fde1af2e6ff9c8b1436177f0b47dcc5c86a96e4dfd35de57610d60 SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa
DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
deleted file mode 100644
index 10154dd5165..00000000000
--- a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- minidlna-1.2.1/configure.ac
-+++ minidlna-1.2.1/configure.ac
-@@ -477,6 +477,9 @@
- AM_CONDITIONAL(NEED_VORBIS, true),
- -logg)
-
-+AC_ARG_ENABLE([avahi], AS_HELP_STRING([--enable-avahi], [Enable search for avahi]))
-+
-+AS_IF([test "x$enable_avahi" = "xyes"], [
- AC_CHECK_LIB(avahi-client, avahi_threaded_poll_new,
- [AC_CHECK_HEADERS([avahi-common/thread-watch.h],
- AM_CONDITIONAL(HAVE_AVAHI, true)
-@@ -484,6 +487,7 @@
- AM_CONDITIONAL(HAVE_AVAHI, false))],
- AM_CONDITIONAL(HAVE_AVAHI, false),
- -lavahi-client -lavahi-common)
-+], [AM_CONDITIONAL(HAVE_AVAHI, false)])
-
- ################################################################################################################
- ### Header checks
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
deleted file mode 100644
index c964214a45e..00000000000
--- a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
- https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="netgear readynas"
-
-RDEPEND="dev-db/sqlite:3
- media-libs/flac
- media-libs/libexif
- media-libs/libid3tag
- media-libs/libogg
- media-libs/libvorbis
- virtual/ffmpeg
- virtual/jpeg:0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
- local my_is_new="yes"
- [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
- # created by above enewuser command w/ wrong group and permissions
- chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
- chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
- # if user already exists, but /var/lib/minidlna is missing
- # rely on ${D}/var/lib/minidlna created in src_install
- fi
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
- -e "/db_dir/s:/var/cache/:/var/lib/:" \
- -i ${PN}.conf || die
-
- epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
-
- epatch_user
-}
-
-src_configure() {
- econf \
- --disable-silent-rules \
- --with-db-path=/var/lib/${PN} \
- --with-log-path=/var/log/${PN} \
- --enable-tivo \
- $(use_enable netgear) \
- $(use_enable readynas)
-}
-
-src_install() {
- default
-
- #bug 536532
- dosym /usr/sbin/${PN}d /usr/bin/${PN}
-
- insinto /etc
- doins ${PN}.conf
-
- newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
- newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
- systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
- echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
- systemd_dotmpfilesd "${T}"/${PN}.conf
-
- dodir /var/{lib,log}/${PN}
- fowners ${PN}:${PN} /var/{lib,log}/${PN}
- fperms 0750 /var/{lib,log}/${PN}
-
- dodoc AUTHORS NEWS README TODO
- doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
- elog "minidlna now runs as minidlna:minidlna (bug 426726),"
- elog "logfile is moved to /var/log/minidlna/minidlna.log,"
- elog "cache is moved to /var/lib/minidlna."
- elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
deleted file mode 100644
index 40ee4bd7a8c..00000000000
--- a/net-misc/minidlna/minidlna-1.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
- https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="avahi netgear readynas"
-
-RDEPEND="dev-db/sqlite:3
- media-libs/flac
- media-libs/libexif
- media-libs/libid3tag
- media-libs/libogg
- media-libs/libvorbis
- virtual/ffmpeg
- virtual/jpeg:0
- avahi? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=( "${WORKDIR}"/${PN}-gentoo-artwork.patch
- "${FILESDIR}"/${P}-buildsystem.patch )
-
-pkg_setup() {
- local my_is_new="yes"
- [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
- # created by above enewuser command w/ wrong group and permissions
- chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
- chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
- # if user already exists, but /var/lib/minidlna is missing
- # rely on ${D}/var/lib/minidlna created in src_install
- fi
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
- -e "/db_dir/s:/var/cache/:/var/lib/:" \
- -i ${PN}.conf || die
-
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-silent-rules \
- --with-db-path=/var/lib/${PN} \
- --with-log-path=/var/log/${PN} \
- --enable-tivo \
- $(use_enable avahi ) \
- $(use_enable netgear) \
- $(use_enable readynas)
-}
-
-src_install() {
- default
-
- #bug 536532
- dosym /usr/sbin/${PN}d /usr/bin/${PN}
-
- insinto /etc
- doins ${PN}.conf
-
- newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
- newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
- systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
- echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
- systemd_dotmpfilesd "${T}"/${PN}.conf
-
- dodir /var/{lib,log}/${PN}
- fowners ${PN}:${PN} /var/{lib,log}/${PN}
- fperms 0750 /var/{lib,log}/${PN}
-
- dodoc AUTHORS NEWS README TODO
- doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
- elog "minidlna now runs as minidlna:minidlna (bug 426726),"
- elog "logfile is moved to /var/log/minidlna/minidlna.log,"
- elog "cache is moved to /var/lib/minidlna."
- elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2020-11-25 17:37 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2020-11-25 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 938fc4a06b68c67f608333fd670bf05b97926ed3
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Nov 25 17:37:32 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> 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 <AT> 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 <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> 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 <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 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() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2020-11-28 0:38 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2020-11-28 0:38 UTC (permalink / raw
To: gentoo-commits
commit: 29047515f406f1f702903206843efc2e51cf538a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 00:24:45 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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 <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.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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2022-05-06 13:20 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2022-05-06 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 19f170afad196e74b2eff334a68f59144c71eb33
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 13:19:55 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 6 13:19:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f170af
net-misc/minidlna: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-misc/minidlna/Manifest | 1 -
.../minidlna/files/minidlna-1.3.0-fd-leak.patch | 28 ------
.../minidlna/files/minidlna-1.3.0-fno-common.patch | 23 -----
net-misc/minidlna/minidlna-1.3.0-r2.ebuild | 102 ---------------------
4 files changed, 154 deletions(-)
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 17670f3ba3c8..24bdf5cb0ea0 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,3 +1,2 @@
-DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
DIST minidlna-1_3_1.tar.gz 299749 BLAKE2B 0c4e5b5dc8b4fb14609cc71eafb008dfab0ef81350ac5c7f1a83e65f54b1d87296b3f0a063dbda3bd642fc777c36a0f839d5426c03ae852b07827a2b7d38c765 SHA512 6e94f33070db04660b83285a13942173537866ab53f9375e3162131fd86948349991a6c60cb2800c46546d73e58222a008d4cee1914c826f3a2f450f1c95a0e5
DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch b/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch
deleted file mode 100644
index eec2bcd020e7..000000000000
--- a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/upnpevents.c b/upnpevents.c
-index 4de6ce8..1126fa7 100644
---- a/upnpevents.c
-+++ b/upnpevents.c
-@@ -290,18 +290,17 @@ upnp_event_create_notify(struct subscriber *sub)
- addr.sin_family = AF_INET;
- inet_aton(obj->addrstr, &addr.sin_addr);
- addr.sin_port = htons(port);
-- DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_notify_connect",
-+ DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_create_notify",
- obj->addrstr, port, obj->path);
- obj->state = EConnecting;
-+ obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE,
-+ .process = upnp_event_process_notify, .data = obj };
-+ event_module.add(&obj->ev);
- if(connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- if(errno != EINPROGRESS && errno != EWOULDBLOCK) {
-- DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_notify_connect", strerror(errno));
-+ DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_create_notify", strerror(errno));
- obj->state = EError;
- }
-- } else {
-- obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE,
-- .process = upnp_event_process_notify, .data = obj };
-- event_module.add(&obj->ev);
- }
-
- return;
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
deleted file mode 100644
index 50da196377f1..000000000000
--- a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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.3.0-r2.ebuild b/net-misc/minidlna/minidlna-1.3.0-r2.ebuild
deleted file mode 100644
index 37b1bb9ceac0..000000000000
--- a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 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
- mirror://gentoo/minidlna-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="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
- "${FILESDIR}"/${P}-fd-leak.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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/
@ 2025-02-26 18:56 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2025-02-26 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 9ad7a8e919e2a4f8f1fb3e8f1ad4477489f8ed25
Author: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com>
AuthorDate: Wed Feb 5 23:20:45 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 18:56:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad7a8e9
net-misc/minidlna: add patch to fix build with ffmpeg 7
With ffmpeg 7, the channels field that was previously deprecated with
ffmpeg 6 has been removed entirely, which breaks the build for this
package. The patch switches to the correct way of doing it now,
which is ch_layout.nb_channels.
Doesn't break building with ffmpeg 6.
Closes: https://bugs.gentoo.org/938728
Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40459
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../minidlna/files/minidlna-1.3.3-ffmpeg7.patch | 21 +++++++++++++++++++++
net-misc/minidlna/minidlna-1.3.3.ebuild | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch b/net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch
new file mode 100644
index 000000000000..f0d9ae3daf5a
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/938728
+https://sourceforge.net/p/minidlna/discussion/879956/thread/81e45c3d64
+
+With ffmpeg 7, the channels field that was previously deprecated with
+ffmpeg 6 has been removed entirely, which breaks the build for this
+package. This patch switches to the correct way of doing it now,
+which is ch_layout.nb_channels.
+
+diff --git a/libav.h b/libav.h
+index b69752c..aed9d18 100644
+--- a/libav.h
++++ b/libav.h
+@@ -174,7 +174,7 @@ lav_get_interlaced(AVStream *s)
+ #define lav_codec_tag(s) s->codecpar->codec_tag
+ #define lav_sample_rate(s) s->codecpar->sample_rate
+ #define lav_bit_rate(s) s->codecpar->bit_rate
+-#define lav_channels(s) s->codecpar->channels
++#define lav_channels(s) s->codecpar->ch_layout.nb_channels
+ #define lav_width(s) s->codecpar->width
+ #define lav_height(s) s->codecpar->height
+ #define lav_profile(s) s->codecpar->profile
diff --git a/net-misc/minidlna/minidlna-1.3.3.ebuild b/net-misc/minidlna/minidlna-1.3.3.ebuild
index e56727ba5429..2f3e5511e18c 100644
--- a/net-misc/minidlna/minidlna-1.3.3.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -42,6 +42,7 @@ CONFIG_CHECK="~INOTIFY_USER"
PATCHES=(
"${WORKDIR}"/minidlna-gentoo-artwork.patch
+ "${FILESDIR}"/minidlna-1.3.3-ffmpeg7.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-02-26 18:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-26 18:56 [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-05-06 13:20 Michał Górny
2020-11-28 0:38 Michał Górny
2020-11-25 17:37 David Seifert
2019-04-07 7:27 Michał Górny
2017-03-19 14:41 Michael Weber
2016-02-23 20:36 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox