commit: 22914d46aa0c30f41cbcf2718882a9839f4bd9ff Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Dec 3 08:39:49 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Dec 3 08:48:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22914d46
net-misc/minidlna: Remove old Bug: https://bugs.gentoo.org/757297 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-misc/minidlna/Manifest | 1 - .../minidlna/files/minidlna-1.2.1-fno-common.patch | 45 -------- net-misc/minidlna/minidlna-1.2.1-r1.ebuild | 114 --------------------- 3 files changed, 160 deletions(-) diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index cea7e6981c0..444e64091e0 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,3 +1,2 @@ -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.2.1-fno-common.patch b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch deleted file mode 100644 index 5cca89b52db..00000000000 --- a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 deleted file mode 100644 index 9d6ba5c94f4..00000000000 --- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils linux-info systemd tmpfiles toolchain-funcs user - -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="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} - 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 - - enewgroup minidlna - enewuser minidlna -1 -1 /var/lib/minidlna minidlna - - fowners minidlna:minidlna /var/{lib,log}/minidlna - fperms 0750 /var/{lib,log}/minidlna - - if [[ -d ${EROOT}/var/lib/minidlna && ${my_is_new} == yes ]]; then - # created by above enewuser command w/ wrong group - # and permissions - chown minidlna:minidlna "${EROOT}"/var/lib/minidlna || die - chmod 0750 "${EROOT}"/var/lib/minidlna || die - # if user already exists, but /var/lib/minidlna is missing - # rely on ${D}/var/lib/minidlna created in src_install - fi -} - -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/minidlna and file ownerships to suit your needs." - - tmpfiles_process minidlna.conf -}
