Re: FIX: multimedia/minidlna and inotify=no
On Fri, Oct 08, 2021 at 07:48:57PM +0100, Edd Barrett wrote: > I believe the config variable was not being checked properly, and that kqueue > watching was being unconditionally used. This diff seems to fix that. and FWIW, I've raised an issue with upstream here: https://sourceforge.net/p/minidlna/bugs/337/ -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
FIX: multimedia/minidlna and inotify=no
Hi,
I noticed that minidlnad would exhaust the file descriptor limit very quickly
if serving large folders, even when `inotify=no` in the config file.
I believe the config variable was not being checked properly, and that kqueue
watching was being unconditionally used. This diff seems to fix that.
(Also silence a mandoc warning while we are here)
OK?
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile8 Feb 2021 17:33:12 - 1.34
+++ Makefile8 Oct 2021 13:12:37 -
@@ -3,6 +3,7 @@
COMMENT= lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
DISTNAME= minidlna-1.3.0
+REVISION= 0
CATEGORIES=multimedia
Index: patches/patch-minidlna_c
===
RCS file: patches/patch-minidlna_c
diff -N patches/patch-minidlna_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-minidlna_c8 Oct 2021 15:49:20 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Ensure kqueue monitoring can be disabled.
+
+Index: minidlna.c
+--- minidlna.c.orig
minidlna.c
+@@ -1150,7 +1150,7 @@ main(int argc, char **argv)
+ #endif /* HAVE_INOTIFY */
+
+ #ifdef HAVE_KQUEUE
+- if (!GETFLAG(SCANNING_MASK)) {
++ if (GETFLAG(INOTIFY_MASK) && !GETFLAG(SCANNING_MASK)) {
+ lav_register_all();
+ kqueue_monitor_start();
+ }
Index: patches/patch-minidlna_conf_5
===
RCS file: patches/patch-minidlna_conf_5
diff -N patches/patch-minidlna_conf_5
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-minidlna_conf_5 8 Oct 2021 15:49:05 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Silence a mandoc warning.
+
+Index: minidlna.conf.5
+--- minidlna.conf.5.orig
minidlna.conf.5
+@@ -1,7 +1,7 @@
+ .\" minidlna.conf man page
+ .TH minidlna.conf 5 "October 2012"
+ .SH NAME
+-minidlna
++minidlna.conf \- minidlnad configuration file
+ .SH DESCRIPTION
+ .PP
+ .B minidlna
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: multimedia/minidlna v1.3.0 (official)
On 2021/02/08 13:23, Mark Patruck wrote:
> On 2/8/21 11:19 AM, Stuart Henderson wrote:
> > On 2021/02/08 11:03, Mark Patruck wrote:
> > > Update multimedia/minidlna to v1.3.0, the first official release since
> > > Aug 2017 and switch back to SF.
> >
> > Probably wants comparing with updated code at
> > https://github.com/glebius/minidlna,
> > I'm not sure what glebius has changed but maybe relevant for us too,
> > freebsd ports commit has "Update to 1.3.0 with my patches rebased on top".
>
> Looks like only the last three commits on Jan 7 2021 are missing in
> the official v1.3.0, as there was no further merge after glebius' wrap
> up to 1.3.0. So i think it's more or less the question, if we should
> stay on the more up-to-date fork or move to official again.
Thanks for checking, let's go with this then.
> > > Besides -fno-common, this fixes
> > >
> > > https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/
> > >
> > > Runs fine on amd64.
> > >
> > > -Mark
> > >
> > > --
> > > Mark Patruck ( mark at wrapped.cx )
> > > GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
> > >
> > > https://www.wrapped.cx
> >
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
> > > retrieving revision 1.33
> > > diff -u -p -r1.33 Makefile
> > > --- Makefile 23 Mar 2020 19:41:56 - 1.33
> > > +++ Makefile 8 Feb 2021 09:54:56 -0000
> > > @@ -2,14 +2,9 @@
> > > COMMENT=lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
> > > -GH_ACCOUNT= glebius
> > > -GH_PROJECT= minidlna
> > > -GH_TAGNAME= f06964a9b4253c93ce96dabd8953eb6dfc4406bd
> > > -V= 1.2.1
> > > -DISTNAME=minidlna-${V}-glebius-${GH_TAGNAME:C/^(.).*/\1/}
> > > -PKGNAME= minidlna-${V}
> > > -
> > > -REVISION=7
> > > +V= 1.3.0
> > > +DISTNAME=minidlna-$V
> > > +PKGNAME= minidlna-$V
> > > CATEGORIES= multimedia
> > > @@ -21,9 +16,7 @@ PERMIT_PACKAGE= Yes
> > > WANTLIB += FLAC avformat avutil c exif iconv id3tag intl jpeg
> > > WANTLIB += ogg pthread sqlite3 vorbis
> > > -# use the github fork, see this link for more information:
> > > -# https://svnweb.freebsd.org/ports?view=revision&revision=489641
> > > -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
> > > +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=minidlna/}
> > > CONFIGURE_STYLE= autoreconf
> > > Index: distinfo
> > > ===
> > > RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
> > > retrieving revision 1.11
> > > diff -u -p -r1.11 distinfo
> > > --- distinfo 23 Mar 2020 19:41:56 - 1.11
> > > +++ distinfo 8 Feb 2021 09:54:56 -
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (minidlna-1.2.1-glebius-f06964a9b.tar.gz) =
> > > CIAL7Y4LIDYFywcenW8LdzDZjXq1+8A1K6N+XXZxulA=
> > > -SIZE (minidlna-1.2.1-glebius-f06964a9b.tar.gz) = 296381
> > > +SHA256 (minidlna-1.3.0.tar.gz) =
> > > R9mwa0xIgBpMERLsI9JHgnKLVJXpXsIZW75cgbwtPGM=
> > > +SIZE (minidlna-1.3.0.tar.gz) = 509576
> > > Index: pkg/DESCR
> > > ===
> > > RCS file: /cvs/ports/multimedia/minidlna/pkg/DESCR,v
> > > retrieving revision 1.3
> > > diff -u -p -r1.3 DESCR
> > > --- pkg/DESCR 20 Mar 2019 11:47:46 - 1.3
> > > +++ pkg/DESCR 8 Feb 2021 09:54:56 -
> > > @@ -1,6 +1,3 @@
> > > ReadyMedia (formerly known as MiniDLNA) is simple media server software,
> > > written in C, with the aim of being fully compliant with DLNA/UPnP-AV
> > > clients
> > > (televisions, tablets, etc).
> > > -
> > > -This is Gleb Smirnoff's fork of original project by Justin Maggard,
> > > created
> > > -temporarily due to low activity of main project.
> >
>
> --
> Mark Patruck ( mark at wrapped.cx )
> GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
>
> https://www.wrapped.cx
>
Re: multimedia/minidlna v1.3.0 (official)
On 2/8/21 11:19 AM, Stuart Henderson wrote:
On 2021/02/08 11:03, Mark Patruck wrote:
Update multimedia/minidlna to v1.3.0, the first official release since
Aug 2017 and switch back to SF.
Probably wants comparing with updated code at
https://github.com/glebius/minidlna,
I'm not sure what glebius has changed but maybe relevant for us too,
freebsd ports commit has "Update to 1.3.0 with my patches rebased on top".
Looks like only the last three commits on Jan 7 2021 are missing in
the official v1.3.0, as there was no further merge after glebius' wrap
up to 1.3.0. So i think it's more or less the question, if we should
stay on the more up-to-date fork or move to official again.
Besides -fno-common, this fixes
https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/
Runs fine on amd64.
-Mark
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
https://www.wrapped.cx
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile23 Mar 2020 19:41:56 - 1.33
+++ Makefile8 Feb 2021 09:54:56 -
@@ -2,14 +2,9 @@
COMMENT= lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
-GH_ACCOUNT= glebius
-GH_PROJECT=minidlna
-GH_TAGNAME=f06964a9b4253c93ce96dabd8953eb6dfc4406bd
-V= 1.2.1
-DISTNAME= minidlna-${V}-glebius-${GH_TAGNAME:C/^(.).*/\1/}
-PKGNAME= minidlna-${V}
-
-REVISION= 7
+V= 1.3.0
+DISTNAME= minidlna-$V
+PKGNAME= minidlna-$V
CATEGORIES= multimedia
@@ -21,9 +16,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += FLAC avformat avutil c exif iconv id3tag intl jpeg
WANTLIB += ogg pthread sqlite3 vorbis
-# use the github fork, see this link for more information:
-# https://svnweb.freebsd.org/ports?view=revision&revision=489641
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
CONFIGURE_STYLE= autoreconf
Index: distinfo
===
RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo23 Mar 2020 19:41:56 - 1.11
+++ distinfo8 Feb 2021 09:54:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (minidlna-1.2.1-glebius-f06964a9b.tar.gz) =
CIAL7Y4LIDYFywcenW8LdzDZjXq1+8A1K6N+XXZxulA=
-SIZE (minidlna-1.2.1-glebius-f06964a9b.tar.gz) = 296381
+SHA256 (minidlna-1.3.0.tar.gz) = R9mwa0xIgBpMERLsI9JHgnKLVJXpXsIZW75cgbwtPGM=
+SIZE (minidlna-1.3.0.tar.gz) = 509576
Index: pkg/DESCR
===
RCS file: /cvs/ports/multimedia/minidlna/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR
--- pkg/DESCR 20 Mar 2019 11:47:46 - 1.3
+++ pkg/DESCR 8 Feb 2021 09:54:56 -
@@ -1,6 +1,3 @@
ReadyMedia (formerly known as MiniDLNA) is simple media server software,
written in C, with the aim of being fully compliant with DLNA/UPnP-AV clients
(televisions, tablets, etc).
-
-This is Gleb Smirnoff's fork of original project by Justin Maggard, created
-temporarily due to low activity of main project.
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
https://www.wrapped.cx
Re: multimedia/minidlna v1.3.0 (official)
On 2021/02/08 11:03, Mark Patruck wrote:
> Update multimedia/minidlna to v1.3.0, the first official release since
> Aug 2017 and switch back to SF.
Probably wants comparing with updated code at
https://github.com/glebius/minidlna,
I'm not sure what glebius has changed but maybe relevant for us too,
freebsd ports commit has "Update to 1.3.0 with my patches rebased on top".
> Besides -fno-common, this fixes
>
> https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/
>
> Runs fine on amd64.
>
> -Mark
>
> --
> Mark Patruck ( mark at wrapped.cx )
> GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
>
> https://www.wrapped.cx
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- Makefile 23 Mar 2020 19:41:56 - 1.33
> +++ Makefile 8 Feb 2021 09:54:56 -
> @@ -2,14 +2,9 @@
>
> COMMENT= lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
>
> -GH_ACCOUNT= glebius
> -GH_PROJECT= minidlna
> -GH_TAGNAME= f06964a9b4253c93ce96dabd8953eb6dfc4406bd
> -V= 1.2.1
> -DISTNAME=minidlna-${V}-glebius-${GH_TAGNAME:C/^(.).*/\1/}
> -PKGNAME= minidlna-${V}
> -
> -REVISION=7
> +V= 1.3.0
> +DISTNAME=minidlna-$V
> +PKGNAME= minidlna-$V
>
> CATEGORIES= multimedia
>
> @@ -21,9 +16,7 @@ PERMIT_PACKAGE= Yes
> WANTLIB += FLAC avformat avutil c exif iconv id3tag intl jpeg
> WANTLIB += ogg pthread sqlite3 vorbis
>
> -# use the github fork, see this link for more information:
> -# https://svnweb.freebsd.org/ports?view=revision&revision=489641
> -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
> +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=minidlna/}
>
> CONFIGURE_STYLE= autoreconf
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 23 Mar 2020 19:41:56 - 1.11
> +++ distinfo 8 Feb 2021 09:54:56 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (minidlna-1.2.1-glebius-f06964a9b.tar.gz) =
> CIAL7Y4LIDYFywcenW8LdzDZjXq1+8A1K6N+XXZxulA=
> -SIZE (minidlna-1.2.1-glebius-f06964a9b.tar.gz) = 296381
> +SHA256 (minidlna-1.3.0.tar.gz) = R9mwa0xIgBpMERLsI9JHgnKLVJXpXsIZW75cgbwtPGM=
> +SIZE (minidlna-1.3.0.tar.gz) = 509576
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/multimedia/minidlna/pkg/DESCR,v
> retrieving revision 1.3
> diff -u -p -r1.3 DESCR
> --- pkg/DESCR 20 Mar 2019 11:47:46 - 1.3
> +++ pkg/DESCR 8 Feb 2021 09:54:56 -
> @@ -1,6 +1,3 @@
> ReadyMedia (formerly known as MiniDLNA) is simple media server software,
> written in C, with the aim of being fully compliant with DLNA/UPnP-AV clients
> (televisions, tablets, etc).
> -
> -This is Gleb Smirnoff's fork of original project by Justin Maggard, created
> -temporarily due to low activity of main project.
multimedia/minidlna v1.3.0 (official)
Update multimedia/minidlna to v1.3.0, the first official release since
Aug 2017 and switch back to SF.
Besides -fno-common, this fixes
https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/
Runs fine on amd64.
-Mark
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
https://www.wrapped.cx
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile23 Mar 2020 19:41:56 - 1.33
+++ Makefile8 Feb 2021 09:54:56 -
@@ -2,14 +2,9 @@
COMMENT= lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
-GH_ACCOUNT=glebius
-GH_PROJECT=minidlna
-GH_TAGNAME=f06964a9b4253c93ce96dabd8953eb6dfc4406bd
-V= 1.2.1
-DISTNAME= minidlna-${V}-glebius-${GH_TAGNAME:C/^(.).*/\1/}
-PKGNAME= minidlna-${V}
-
-REVISION= 7
+V= 1.3.0
+DISTNAME= minidlna-$V
+PKGNAME= minidlna-$V
CATEGORIES=multimedia
@@ -21,9 +16,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += FLAC avformat avutil c exif iconv id3tag intl jpeg
WANTLIB += ogg pthread sqlite3 vorbis
-# use the github fork, see this link for more information:
-# https://svnweb.freebsd.org/ports?view=revision&revision=489641
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
CONFIGURE_STYLE= autoreconf
Index: distinfo
===
RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo23 Mar 2020 19:41:56 - 1.11
+++ distinfo8 Feb 2021 09:54:56 -
@@ -1,2 +1,2 @@
-SHA256 (minidlna-1.2.1-glebius-f06964a9b.tar.gz) =
CIAL7Y4LIDYFywcenW8LdzDZjXq1+8A1K6N+XXZxulA=
-SIZE (minidlna-1.2.1-glebius-f06964a9b.tar.gz) = 296381
+SHA256 (minidlna-1.3.0.tar.gz) = R9mwa0xIgBpMERLsI9JHgnKLVJXpXsIZW75cgbwtPGM=
+SIZE (minidlna-1.3.0.tar.gz) = 509576
Index: pkg/DESCR
===
RCS file: /cvs/ports/multimedia/minidlna/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR
--- pkg/DESCR 20 Mar 2019 11:47:46 - 1.3
+++ pkg/DESCR 8 Feb 2021 09:54:56 -
@@ -1,6 +1,3 @@
ReadyMedia (formerly known as MiniDLNA) is simple media server software,
written in C, with the aim of being fully compliant with DLNA/UPnP-AV clients
(televisions, tablets, etc).
-
-This is Gleb Smirnoff's fork of original project by Justin Maggard, created
-temporarily due to low activity of main project.
Fw: minidlna
On Thu, 25 Aug 2016 14:24:43 +0100 Stuart Henderson wrote: [...] Yes, it's a poor report, but when I saw no manual I wanted to make sure that it was still a package before proceeding further. Lack of manual was fixed by fixing a typo in a "is there a newer snapshot? let's get the sets ahead of time!" cron job. The manual states that minidlna runs as user nobody, but that doesn't match the installation. Starting manually, it works. But only manually. dmesg, logs, config files below sig. -- Edward Ahlsen-Girard Ft Walton Beach, FL OpenBSD 5.8-current (GENERIC.MP) #1568: Wed Nov 4 20:48:36 MST 2015 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 4242014208 (4045MB) avail mem = 4109324288 (3918MB) mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root bios0 at mainbus0: SMBIOS rev. 2.5 @ 0xf06d0 (43 entries) bios0: vendor American Megatrends Inc. version "0504" date 10/05/2009 bios0: ASUSTeK Computer INC. P-P5G41 acpi0 at bios0: rev 2 acpi0: sleep states S0 S1 S3 S4 S5 acpi0: tables DSDT FACP APIC MCFG OEMB HPET GSCI SSDT acpi0: wakeup devices P0P2(S4) P0P3(S4) P0P1(S4) UAR1(S4) PS2K(S4) PS2M(S4) USB0(S4) USB1(S4) USB2(S4) USB3(S4) EUSB(S4) MC97(S4) P0P4(S4) P0P5(S4) P0P6(S4) P0P7(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Core(TM)2 Duo CPU E7500 @ 2.93GHz, 2933.71 MHz cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,XSAVE,NXE,LONG,LAHF,PERF,SENSOR cpu0: 3MB 64b/line 8-way L2 cache cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges cpu0: apic clock running at 277MHz cpu0: mwait min=64, max=64, C-substates=0.2.2.2.2, IBE cpu1 at mainbus0: apid 1 (application processor) cpu1: Intel(R) Core(TM)2 Duo CPU E7500 @ 2.93GHz, 3050.63 MHz cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,XSAVE,NXE,LONG,LAHF,PERF,SENSOR cpu1: 3MB 64b/line 8-way L2 cache cpu1: smt 0, core 1, package 0 ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins acpimcfg0 at acpi0 addr 0xf000, bus 0-63 acpihpet0 at acpi0: 14318179 Hz acpiprt0 at acpi0: bus 0 (PCI0) acpiprt1 at acpi0: bus -1 (P0P2) acpiprt2 at acpi0: bus -1 (P0P3) acpiprt3 at acpi0: bus 3 (P0P4) acpiprt4 at acpi0: bus -1 (P0P5) acpiprt5 at acpi0: bus 2 (P0P6) acpiprt6 at acpi0: bus 1 (P0P7) acpicpu0 at acpi0: !C2(500@1 mwait.1@0x10), C1(1000@1 mwait.1), PSS acpicpu1 at acpi0: !C2(500@1 mwait.1@0x10), C1(1000@1 mwait.1), PSS aibs0 at acpi0 RTMP RVLT RFAN GGRP GITM SITM aibs0: FSIF: invalid package acpibtn0 at acpi0: PWRB cpu0: Enhanced SpeedStep 2933 MHz: speeds: 2936, 2670, 2403, 2136, 1870, 1603 MHz pci0 at mainbus0 bus 0 pchb0 at pci0 dev 0 function 0 "Intel G41 Host" rev 0x03 inteldrm0 at pci0 dev 2 function 0 "Intel G41 Video" rev 0x03 drm0 at inteldrm0 intagp0 at inteldrm0 agp0 at intagp0: aperture at 0xe000, size 0x1000 inteldrm0: msi inteldrm0: 1920x1080 wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation) wsdisplay0: screen 1-5 added (std, vt100 emulation) "Intel G41 Video" rev 0x03 at pci0 dev 2 function 1 not configured azalia0 at pci0 dev 27 function 0 "Intel 82801GB HD Audio" rev 0x01: msi azalia0: codecs: Realtek ALC888 audio0 at azalia0 ppb0 at pci0 dev 28 function 0 "Intel 82801GB PCIE" rev 0x01: msi pci1 at ppb0 bus 3 xhci0 at pci1 dev 0 function 0 vendor "Fresco Logic", unknown product 0x1100 rev 0x01: msi usb0 at xhci0: USB revision 3.0 uhub0 at usb0 "Fresco Logic xHCI root hub" rev 3.00/1.00 addr 1 ppb1 at pci0 dev 28 function 2 "Intel 82801GB PCIE" rev 0x01: msi pci2 at ppb1 bus 2 re0 at pci2 dev 0 function 0 "Realtek 8168" rev 0x02: RTL8168C/8111C (0x3c00), msi, address 48:5b:39:c5:63:95 rgephy0 at re0 phy 7: RTL8169S/8110S/8211 PHY, rev. 2 ppb2 at pci0 dev 28 function 3 "Intel 82801GB PCIE" rev 0x01: msi pci3 at ppb2 bus 1 vendor "VIA", unknown product 0x3401 (class serial bus subclass Firewire, rev 0x00) at pci3 dev 0 function 0 not configured vendor "VIA", unknown product 0x401a (class mass storage subclass miscellaneous, rev 0x00) at pci3 dev 0 function 1 not configured sdhc0 at pci3 dev 0 function 2 vendor "VIA", unknown product 0x401b rev 0x00: apic 2 int 19 sdhc0 at 0x10: can't map registers uhci0 at pci0 dev 29 function 0 "Intel 82801GB USB" rev 0x01: apic 2 int 23 uhci1 at pci0 dev 29 function 1 "Intel 82801GB USB" rev 0x01: apic 2 int 19 uhci2 at pci0 dev 29 function 2 "Intel 82801GB USB" rev 0x01: apic 2 int 18 uhci3 at pci0 dev 29 fu
Re: minidlna
Stuart Henderson wrote: >> On Mon, Aug 22, 2016 at 06:42:36PM -0500, Ed Ahlsen-Girard wrote: >>> While attempting to trouble shoot minidlna (21 Aug 2016 snap) I found >>> that the package has no docs, either as minidlna, minidlnad, or >>> readymedia. Checked for man and info pages both. In addition to not >>> running on my machine. > > "Not running on my machine" is a poor problem report. Logs? Startup > messages? dmesg? > > Works fine here. (amd64). Just sometimes triggers pf surveillance and i get my lan IP listed into my "bruteforce" pf table. Eric.
Re: minidlna
Marc Espie wrote: > On Mon, Aug 22, 2016 at 06:42:36PM -0500, Ed Ahlsen-Girard wrote: >> While attempting to trouble shoot minidlna (21 Aug 2016 snap) I found >> that the package has no docs, either as minidlna, minidlnad, or >> readymedia. Checked for man and info pages both. In addition to not >> running on my machine. >> >> Is it being abandoned? > > it's still alive and kicking. I've seen updates on my netgear nas. > > Speaking of minidlna (which runs fine according to my androids systems as clients), is there a package/port acting fine as dlna client ? Eric.
Re: minidlna
> On Mon, Aug 22, 2016 at 06:42:36PM -0500, Ed Ahlsen-Girard wrote: > > While attempting to trouble shoot minidlna (21 Aug 2016 snap) I found > > that the package has no docs, either as minidlna, minidlnad, or > > readymedia. Checked for man and info pages both. In addition to not > > running on my machine. "Not running on my machine" is a poor problem report. Logs? Startup messages? dmesg?
Re: minidlna
On Mon, Aug 22, 2016 at 06:42:36PM -0500, Ed Ahlsen-Girard wrote: > While attempting to trouble shoot minidlna (21 Aug 2016 snap) I found > that the package has no docs, either as minidlna, minidlnad, or > readymedia. Checked for man and info pages both. In addition to not > running on my machine. > > Is it being abandoned? it's still alive and kicking. I've seen updates on my netgear nas.
minidlna
While attempting to trouble shoot minidlna (21 Aug 2016 snap) I found that the package has no docs, either as minidlna, minidlnad, or readymedia. Checked for man and info pages both. In addition to not running on my machine. Is it being abandoned? -- Edward Ahlsen-Girard Ft Walton Beach, FL
Re: minidlna not working with minissdpd
On h, júl 13, 2015 at 14:22:06 +0200, LÉVAI Dániel wrote: [...] > (run it with debug mode enabled, and you'll see), but somehow they get > lost between the software and the hardware. Ehm, sorry for this BS. The problem actually lies inside minidlna: http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=4413 sthen@, would you like for me to cook up a diff for the port to include this tiny patch to fix it? Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: minidlna not working with minissdpd
On h, júl 13, 2015 at 11:14:19 +0300, kasak wrote:
> Hello everyone! I'm in trouble with minidlna, installed from pkgs in OpenBSD
> 5.7
> I have installed miniupnpd, minidlna, and minissdpd from packages, added
> "minissdpd_flags=-i em1" in my /etc/rc.conf.local, next i uncommented
>
> "minissdpdsocket=/var/run/minissdpd.sock" in files /etc/miniupnpd.conf and
> /etc/minidlna.conf
>
> and started all daemons in next order:
> minissdpd - miniupnpd - minidlna and it seems that miniupnpd works and
> minidlna not :(
>
> In other words, it is starting and i can open http://192.168.0.1:8200 but it
> does not appear on dlna clients
>
> Otherwise, if I disable all minissdpd, miniupnpd and start minidlna alone,
> it works well! If I try to start only minissdpd and minidlna it doesn't
> work.
I have the same exact issue with the mini* trio.
My setup is a bit more "complicated", it involves three network
interfaces and a bridge. What is interesting however, is that it seems
this is somehow related to the bridge or one of the NIC's drivers,
because with bge(4) minissdpd+minidlna works, but with fxp(4)+bridge(4)
minissdpd+minidlna does not. The discoveries (multicast) are received
from upnp clients, and the advertisements get sent out from minissdpd
(run it with debug mode enabled, and you'll see), but somehow they get
lost between the software and the hardware.
Shame on me, because I didn't debug it further and reported it, but this
is an older OBSD 5.5, with an old hardware, and I thought I upgrade both
first, and try it out with different NICs and a -current OBSD.
However, seeing that someone else already feels the same pain, I thought
I'll just chime in...
> Here is some log when starting minidlna:
> [2015/07/12 23:51:16] minidlna.c:1026: warn: Starting MiniDLNA version
> 1.1.4.
> [2015/07/12 23:51:16] minissdp.c:114: error: bind(udp): Address already in
> use
> [2015/07/12 23:51:16] minidlna.c:1065: warn: HTTP listening on port 8200
> [2015/07/12 23:51:16] minissdp.c:80: error: setsockopt(udp,
> IP_ADD_MEMBERSHIP): Bad file descriptor
> [2015/07/12 23:51:16] minissdp.c:180: warn: Failed to add multicast
> membership for address 192.168.0.1
>
> Maybe I'm doing something wrong? Or is it a bug?
The first error ("minissdpd.c:114: error: ...") is actually from minidlna,
and if minissdpd is already running, it just confirms that minissdpd
already binds to the required address, and minidlna should fall back to
the socket that is configured in minidlna.conf to communicate with
minissdpd.
Running minissdpd with the -d option, and minidlna with -d and -v tells
you more information during client discoveries and replies; maybe it
will be useful to post those to the list also (at least for just the
archives), and I'll try to do the same sometime.
Daniel
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
minidlna not working with minissdpd
Hello everyone! I'm in trouble with minidlna, installed from pkgs in OpenBSD 5.7 I have installed miniupnpd, minidlna, and minissdpd from packages, added "minissdpd_flags=-i em1" in my /etc/rc.conf.local, next i uncommented "minissdpdsocket=/var/run/minissdpd.sock" in files /etc/miniupnpd.conf and /etc/minidlna.conf and started all daemons in next order: minissdpd - miniupnpd - minidlna and it seems that miniupnpd works and minidlna not :( In other words, it is starting and i can open http://192.168.0.1:8200 but it does not appear on dlna clients Otherwise, if I disable all minissdpd, miniupnpd and start minidlna alone, it works well! If I try to start only minissdpd and minidlna it doesn't work. Here is some log when starting minidlna: [2015/07/12 23:51:16] minidlna.c:1026: warn: Starting MiniDLNA version 1.1.4. [2015/07/12 23:51:16] minissdp.c:114: error: bind(udp): Address already in use [2015/07/12 23:51:16] minidlna.c:1065: warn: HTTP listening on port 8200 [2015/07/12 23:51:16] minissdp.c:80: error: setsockopt(udp, IP_ADD_MEMBERSHIP): Bad file descriptor [2015/07/12 23:51:16] minissdp.c:180: warn: Failed to add multicast membership for address 192.168.0.1 Maybe I'm doing something wrong? Or is it a bug?
Re: minidlna media db. refresh
On 2015/01/25 11:03, LÉVAI Dániel wrote: > Given that I also experienced a general slowness when using kevents, > this "update" seems a bit shaky to me; nevertheless, it seems to be > working. > > Maybe by default, we could disable "inotify" in the config, and just > write a notice after package install that the user has the option to > turn this on, with some fair warnings? I'm a bit unsure about whether to include this in the port at this time, so for now I've just taken a slightly modified version of the config diff to mention uuid, and will look at the kevent parts in more detail when I have more time.. > +BUILD_DEPENDS= devel/autoconf/2.69 \ > + devel/automake/1.14 btw these ones should use the MODGNU_AUTO*_DEPENDS variables which are set automatically from AUTO*_VERSION, rather than hardcoding the port specs here.
Re: minidlna media db. refresh
On h, jan 19, 2015 at 17:16:06 +0100, Antoine Jacoutot wrote:
> On Mon, Jan 19, 2015 at 05:13:09PM +0100, David Coppa wrote:
> > On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel wrote:
> >
> > >> It might be better to look at the kqueue patch that FreeBSD are using.
> > >
> > > Now this seems to work for me on i386, at least. It applied almost
> > > clean, but I've taken the liberty and removed the whitespace-only
> > > changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
> > > this could very well be because of my rusty hard drives.
> > >
> > > Here is my diff:
> >
> > I do not use MiniDLNA, but your diff below looks good and, if it
> > works, then it's ok with me if Stuart wants to commit it.
>
> There seems to be a missing bdep on the autostuffs.
Thanks! New diff with BUILD_DEPENDS, and some notes/concerns.
While I'm browsing a directory on my tv with pictures in it, during some
(not all) of the thumbnail generations I get these errors in
minidlna.log:
inotify.c:856: warn: kevent polling failure: Interrupted system call
I get like couple of hundreds with more than 500+ pictures in the dir.
I only found this in connection with this error:
http://lists.freebsd.org/pipermail/freebsd-ports/2014-June/093524.html
Which could be suspicious, but it really can't seem to hurt anything
(except the growing log file).
Anyway, one of the most annoying things while I was testing was the
(duplicate) re-appearance of the network server in the tv's network
browser menu, after every minidlnad restart. Turns out, it generates a
random uuid on every startup if one is not defined in the configuration
file. So I inserted an example uuid= line into the minidlna.conf config
file with a short comment.
Given that I also experienced a general slowness when using kevents,
this "update" seems a bit shaky to me; nevertheless, it seems to be
working.
Maybe by default, we could disable "inotify" in the config, and just
write a notice after package install that the user has the option to
turn this on, with some fair warnings?
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- Makefile3 Sep 2014 21:15:43 - 1.10
+++ Makefile25 Jan 2015 10:00:53 -
@@ -3,6 +3,7 @@
COMMENT= lightweight DLNA/UPnP-AV media server
V= 1.1.4
+REVISION= 0
DISTNAME= minidlna-$V
PKGNAME= minidlna-$V
@@ -28,15 +29,25 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
LDFLAGS="-L${LOCALBASE}/lib"
MODULES= devel/gettext
+
+BUILD_DEPENDS= devel/autoconf/2.69 \
+ devel/automake/1.14
+
LIB_DEPENDS= audio/flac \
audio/libid3tag \
graphics/ffmpeg \
graphics/jpeg \
graphics/libexif
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
+
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
+post-patch:
+ @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 25 Jan 2015 10:00:53 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Tue Aug 26 23:09:22 2014
configure.ac Sun Jan 18 22:45:07 2015
+@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+
+ ### Header checks
+
+-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h
sys/event.h])
+
+ AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
inotify support]), [
+ AC_MSG_CHECKING([for __NR_inotify_init syscall])
Index: patches/patch-inotify_c
===
RCS file: patches/patch-inotify_c
diff -N patches/patch-inotify_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-inotify_c 25 Jan 2015 10:00:53 -
@@ -0,0 +1,469 @@
+$OpenB
Re: minidlna media db. refresh
On h, jan 19, 2015 at 18:53:48 +0100, Martijn van Duren wrote: > On 01/19/15 17:13, David Coppa wrote: > >On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel wrote: > > > >>>It might be better to look at the kqueue patch that FreeBSD are using. > >> > >>Now this seems to work for me on i386, at least. It applied almost > >>clean, but I've taken the liberty and removed the whitespace-only > >>changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but > >>this could very well be because of my rusty hard drives. > >> > >>Here is my diff: > > > >I do not use MiniDLNA, but your diff below looks good and, if it > >works, then it's ok with me if Stuart wants to commit it. > > How will this patch affect libraries with more then 512 directories, since > kqueue is restricted by the limit of open file descriptors? > martijn@donar:/home/multimedia/Video's$ ulimit -n > 512 > martijn@donar:/home/multimedia/Video's$ find . -type d | wc -l > 2345 > martijn@donar:/home/multimedia/Video's$ find . -type f | wc -l >57640 > [...] I think that's why we need testing :) Daniel > >> > >>Comments, tests? > >> > >> > >>Daniel > >> > >>-- > >>LÉVAI Dániel > >>PGP key ID = 0x83B63A8F > >>Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: minidlna media db. refresh
On 01/19/15 17:13, David Coppa wrote:
On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel wrote:
It might be better to look at the kqueue patch that FreeBSD are using.
Now this seems to work for me on i386, at least. It applied almost
clean, but I've taken the liberty and removed the whitespace-only
changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
this could very well be because of my rusty hard drives.
Here is my diff:
I do not use MiniDLNA, but your diff below looks good and, if it
works, then it's ok with me if Stuart wants to commit it.
How will this patch affect libraries with more then 512 directories,
since kqueue is restricted by the limit of open file descriptors?
martijn@donar:/home/multimedia/Video's$ ulimit -n
512
martijn@donar:/home/multimedia/Video's$ find . -type d | wc -l
2345
martijn@donar:/home/multimedia/Video's$ find . -type f | wc -l
57640
ciao,
David
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- Makefile3 Sep 2014 21:15:43 - 1.10
+++ Makefile18 Jan 2015 22:45:10 -
@@ -3,6 +3,7 @@
COMMENT= lightweight DLNA/UPnP-AV media server
V= 1.1.4
+REVISION= 0
DISTNAME= minidlna-$V
PKGNAME= minidlna-$V
@@ -34,9 +35,15 @@ LIB_DEPENDS= audio/flac \
graphics/jpeg \
graphics/libexif
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
+
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
+post-patch:
+ @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 18 Jan 2015 22:45:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Tue Aug 26 23:09:22 2014
configure.ac Sun Jan 18 22:45:07 2015
+@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+
+ ### Header checks
+
+-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h
sys/event.h])
+
+ AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
inotify support]), [
+ AC_MSG_CHECKING([for __NR_inotify_init syscall])
Index: patches/patch-inotify_c
===
RCS file: patches/patch-inotify_c
diff -N patches/patch-inotify_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-inotify_c 18 Jan 2015 22:45:10 -
@@ -0,0 +1,569 @@
+$OpenBSD$
+--- inotify.c.orig Sun Jan 18 22:45:24 2015
inotify.c Sun Jan 18 22:45:27 2015
+@@ -15,9 +15,9 @@
+ * You should have received a copy of the GNU General Public License
+ * along with MiniDLNA. If not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "config.h"
+
+-#ifdef HAVE_INOTIFY
++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H)
+ #include
+ #include
+ #include
+@@ -31,11 +31,16 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_INOTIFY
+ #ifdef HAVE_SYS_INOTIFY_H
+ #include
+-#else
++#else /*HAVE_SYS_INOTIFY_H*/
+ #include "linux/inotify.h"
+ #include "linux/inotify-syscalls.h"
++#endif /*HAVE_SYS_INOTIFY_H*/
++#else
++#include
++#include
+ #endif
+ #include "libav.h"
+
+@@ -49,11 +54,13 @@
+ #include "playlist.h"
+ #include "log.h"
+
++#ifdef HAVE_INOTIFY
+ #define EVENT_SIZE ( sizeof (struct inotify_event) )
+ #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
+ #define DESIRED_WATCH_LIMIT 65536
+
+ #define PATH_BUF_SIZE PATH_MAX
++#endif
+
+ struct watch
+ {
+@@ -86,13 +93,35 @@ add_watch(int fd, const char * path)
+ struct watch *nw;
+ int wd;
+
++#ifdef HAVE_INOTIFY
+ wd = inotify_add_watch(fd, path,
IN_CREATE|IN_CLOSE_WRITE|IN_DELETE|IN_MOVE);
+ if( wd < 0 )
+ {
+ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch(%s) [%s]\n",
path, strerror(errno));
+ return -1;
+ }
++#else /*HAVE_INOTIFY*/
++ wd = open(path, O_RDONLY);
++ if (wd == -1
Re: minidlna media db. refresh
On Mon, Jan 19, 2015 at 05:13:09PM +0100, David Coppa wrote:
> On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel wrote:
>
> >> It might be better to look at the kqueue patch that FreeBSD are using.
> >
> > Now this seems to work for me on i386, at least. It applied almost
> > clean, but I've taken the liberty and removed the whitespace-only
> > changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
> > this could very well be because of my rusty hard drives.
> >
> > Here is my diff:
>
> I do not use MiniDLNA, but your diff below looks good and, if it
> works, then it's ok with me if Stuart wants to commit it.
There seems to be a missing bdep on the autostuffs.
>
> ciao,
> David
>
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
> > retrieving revision 1.10
> > diff -p -u -r1.10 Makefile
> > --- Makefile3 Sep 2014 21:15:43 - 1.10
> > +++ Makefile18 Jan 2015 22:45:10 -
> > @@ -3,6 +3,7 @@
> > COMMENT= lightweight DLNA/UPnP-AV media server
> >
> > V= 1.1.4
> > +REVISION= 0
> > DISTNAME= minidlna-$V
> > PKGNAME= minidlna-$V
> >
> > @@ -34,9 +35,15 @@ LIB_DEPENDS= audio/flac \
> > graphics/jpeg \
> > graphics/libexif
> >
> > +AUTOCONF_VERSION= 2.69
> > +AUTOMAKE_VERSION= 1.14
> > +
> > NO_TEST= Yes
> > E= ${PREFIX}/share/examples/minidlna
> >
> > +post-patch:
> > + @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> > + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
> > post-install:
> > ${INSTALL_DATA_DIR} $E
> > ${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
> > Index: patches/patch-configure_ac
> > ===
> > RCS file: patches/patch-configure_ac
> > diff -N patches/patch-configure_ac
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-configure_ac 18 Jan 2015 22:45:10 -
> > @@ -0,0 +1,12 @@
> > +$OpenBSD$
> > +--- configure.ac.orig Tue Aug 26 23:09:22 2014
> > configure.ac Sun Jan 18 22:45:07 2015
> > +@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
> > +
> >
> > + ### Header checks
> > +
> > +-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h
> > fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h
> > sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h
> > unistd.h])
> > ++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h
> > fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h
> > sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h
> > unistd.h sys/event.h])
> > +
> > + AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
> > inotify support]), [
> > + AC_MSG_CHECKING([for __NR_inotify_init syscall])
> > Index: patches/patch-inotify_c
> > ===
> > RCS file: patches/patch-inotify_c
> > diff -N patches/patch-inotify_c
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-inotify_c 18 Jan 2015 22:45:10 -
> > @@ -0,0 +1,569 @@
> > +$OpenBSD$
> > +--- inotify.c.orig Sun Jan 18 22:45:24 2015
> > inotify.c Sun Jan 18 22:45:27 2015
> > +@@ -15,9 +15,9 @@
> > + * You should have received a copy of the GNU General Public License
> > + * along with MiniDLNA. If not, see <http://www.gnu.org/licenses/>.
> > + */
> > + #include "config.h"
> > +
> > +-#ifdef HAVE_INOTIFY
> > ++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H)
> > + #include
> > + #include
> > + #include
> > +@@ -31,11 +31,16 @@
> > + #include
> > + #include
> > + #include
> > ++#ifdef HAVE_INOTIFY
> > + #ifdef HAVE_SYS_INOTIFY_H
> > + #include
> > +-#else
> > ++#else /*HAVE_SYS_INOTIFY_H*/
> > + #include "linux/inotify.h"
> > + #include "linux/inotify-syscalls.h"
> > ++#endif /*HAVE_SYS_INOTIFY_H*/
> > ++#else
> > ++#include
> > ++#include
> > + #endif
> > + #include "libav.h
Re: minidlna media db. refresh
On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel wrote:
>> It might be better to look at the kqueue patch that FreeBSD are using.
>
> Now this seems to work for me on i386, at least. It applied almost
> clean, but I've taken the liberty and removed the whitespace-only
> changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
> this could very well be because of my rusty hard drives.
>
> Here is my diff:
I do not use MiniDLNA, but your diff below looks good and, if it
works, then it's ok with me if Stuart wants to commit it.
ciao,
David
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
> retrieving revision 1.10
> diff -p -u -r1.10 Makefile
> --- Makefile3 Sep 2014 21:15:43 - 1.10
> +++ Makefile18 Jan 2015 22:45:10 -
> @@ -3,6 +3,7 @@
> COMMENT= lightweight DLNA/UPnP-AV media server
>
> V= 1.1.4
> +REVISION= 0
> DISTNAME= minidlna-$V
> PKGNAME= minidlna-$V
>
> @@ -34,9 +35,15 @@ LIB_DEPENDS= audio/flac \
> graphics/jpeg \
> graphics/libexif
>
> +AUTOCONF_VERSION= 2.69
> +AUTOMAKE_VERSION= 1.14
> +
> NO_TEST= Yes
> E= ${PREFIX}/share/examples/minidlna
>
> +post-patch:
> + @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
> post-install:
> ${INSTALL_DATA_DIR} $E
> ${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure_ac 18 Jan 2015 22:45:10 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- configure.ac.orig Tue Aug 26 23:09:22 2014
> configure.ac Sun Jan 18 22:45:07 2015
> +@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
> +
>
> + ### Header checks
> +
> +-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h
> fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h
> sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h
> unistd.h])
> ++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h
> fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h
> sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h
> unistd.h sys/event.h])
> +
> + AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
> inotify support]), [
> + AC_MSG_CHECKING([for __NR_inotify_init syscall])
> Index: patches/patch-inotify_c
> ===
> RCS file: patches/patch-inotify_c
> diff -N patches/patch-inotify_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-inotify_c 18 Jan 2015 22:45:10 -0000
> @@ -0,0 +1,569 @@
> +$OpenBSD$
> +--- inotify.c.orig Sun Jan 18 22:45:24 2015
> inotify.c Sun Jan 18 22:45:27 2015
> +@@ -15,9 +15,9 @@
> + * You should have received a copy of the GNU General Public License
> + * along with MiniDLNA. If not, see <http://www.gnu.org/licenses/>.
> + */
> + #include "config.h"
> +
> +-#ifdef HAVE_INOTIFY
> ++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H)
> + #include
> + #include
> + #include
> +@@ -31,11 +31,16 @@
> + #include
> + #include
> + #include
> ++#ifdef HAVE_INOTIFY
> + #ifdef HAVE_SYS_INOTIFY_H
> + #include
> +-#else
> ++#else /*HAVE_SYS_INOTIFY_H*/
> + #include "linux/inotify.h"
> + #include "linux/inotify-syscalls.h"
> ++#endif /*HAVE_SYS_INOTIFY_H*/
> ++#else
> ++#include
> ++#include
> + #endif
> + #include "libav.h"
> +
> +@@ -49,11 +54,13 @@
> + #include "playlist.h"
> + #include "log.h"
> +
> ++#ifdef HAVE_INOTIFY
> + #define EVENT_SIZE ( sizeof (struct inotify_event) )
> + #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
> + #define DESIRED_WATCH_LIMIT 65536
> +
> + #define PATH_BUF_SIZE PATH_MAX
> ++#endif
> +
> + struct watch
> + {
> +@@ -86,13 +93,35 @@ add_watch(int fd, const char * path)
> + struct watch *nw;
> + int wd;
> +
> ++#ifdef HAVE_INOTIFY
> + wd = inotify_add_watch(fd, path,
> IN_CREATE|IN_CLOSE_WRITE|IN_DELETE|IN_MOVE);
> + if( w
Re: minidlna media db. refresh
On v, jan 18, 2015 at 19:57:44 +, Stuart Henderson wrote:
> On 2015/01/18 19:10, David Coppa wrote:
> > On Sun, Jan 18, 2015 at 6:38 PM, Stuart Henderson wrote:
> > > On 2015/01/18 17:42, LÉVAI Dániel wrote:
> > >> Hi!
> > >>
> > >> Has anyone ever had a problem with minidlna not refreshing its media
> > >> library automatically (on -current)?
> > >
> > > That's expected.
> > >
> > >> Does this only work on Linux w/ inotify?
> > >
> > > yep.
> >
> > Daniel, maybe you could investigate if devel/libinotify is good enough for
> > it.
Yeah, I got it compiled, but the first thing was a segfault, and I
didn't even bother to dig deeper after I read sthen@'s mail about a
patch to support kqueue/kevent in FreeBSD's ports tree :-) Also, it
seems with libinotify's lib installed in an unusual place (lib/inotify),
one would had to start minidlnad with LD_LIBRARY_FLAGS set -- but of
course, I may be incorrect.
> It might be better to look at the kqueue patch that FreeBSD are using.
Now this seems to work for me on i386, at least. It applied almost
clean, but I've taken the liberty and removed the whitespace-only
changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
this could very well be because of my rusty hard drives.
Here is my diff:
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- Makefile3 Sep 2014 21:15:43 -0000 1.10
+++ Makefile 18 Jan 2015 22:45:10 -
@@ -3,6 +3,7 @@
COMMENT= lightweight DLNA/UPnP-AV media server
V= 1.1.4
+REVISION= 0
DISTNAME= minidlna-$V
PKGNAME= minidlna-$V
@@ -34,9 +35,15 @@ LIB_DEPENDS= audio/flac \
graphics/jpeg \
graphics/libexif
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
+
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
+post-patch:
+ @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 18 Jan 2015 22:45:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Tue Aug 26 23:09:22 2014
configure.ac Sun Jan 18 22:45:07 2015
+@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+
+ ### Header checks
+
+-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h
sys/event.h])
+
+ AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
inotify support]), [
+ AC_MSG_CHECKING([for __NR_inotify_init syscall])
Index: patches/patch-inotify_c
===
RCS file: patches/patch-inotify_c
diff -N patches/patch-inotify_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-inotify_c 18 Jan 2015 22:45:10 -
@@ -0,0 +1,569 @@
+$OpenBSD$
+--- inotify.c.orig Sun Jan 18 22:45:24 2015
inotify.c Sun Jan 18 22:45:27 2015
+@@ -15,9 +15,9 @@
+ * You should have received a copy of the GNU General Public License
+ * along with MiniDLNA. If not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "config.h"
+
+-#ifdef HAVE_INOTIFY
++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H)
+ #include
+ #include
+ #include
+@@ -31,11 +31,16 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_INOTIFY
+ #ifdef HAVE_SYS_INOTIFY_H
+ #include
+-#else
++#else /*HAVE_SYS_INOTIFY_H*/
+ #include "linux/inotify.h"
+ #include "linux/inotify-syscalls.h"
++#endif /*HAVE_SYS_INOTIFY_H*/
++#else
++#include
++#include
+ #endif
+ #include "libav.h"
+
+@@ -49,11 +54,13 @@
+ #include "playlist.h"
+ #include "log.h"
+
++#ifdef HAVE_INOTIFY
+ #define EVENT_SIZE ( sizeof (struct inotify_event) )
+ #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
+ #define DESIRED_WATCH_LIMIT 65536
+
+ #define PATH_BUF_SIZE PATH_MAX
++#
Re: minidlna media db. refresh
On 2015/01/18 19:10, David Coppa wrote: > On Sun, Jan 18, 2015 at 6:38 PM, Stuart Henderson wrote: > > On 2015/01/18 17:42, LÉVAI Dániel wrote: > >> Hi! > >> > >> Has anyone ever had a problem with minidlna not refreshing its media > >> library automatically (on -current)? > > > > That's expected. > > > >> Does this only work on Linux w/ inotify? > > > > yep. > > Daniel, maybe you could investigate if devel/libinotify is good enough for it. It might be better to look at the kqueue patch that FreeBSD are using.
Re: minidlna media db. refresh
On Sun Jan 18, 2015 at 05:42:05PM +0100, LÉVAI Dániel wrote: > Hi! > > Has anyone ever had a problem with minidlna not refreshing its media > library automatically (on -current)? > Does this only work on Linux w/ inotify? > > > Daniel > > -- > LÉVAI Dániel > PGP key ID = 0x83B63A8F > Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F Workaround: sudo rm -f /var/db/minidlna/files.db && sudo rcctl restart minidlna
Re: minidlna media db. refresh
On Sun, Jan 18, 2015 at 6:38 PM, Stuart Henderson wrote: > On 2015/01/18 17:42, LÉVAI Dániel wrote: >> Hi! >> >> Has anyone ever had a problem with minidlna not refreshing its media >> library automatically (on -current)? > > That's expected. > >> Does this only work on Linux w/ inotify? > > yep. Daniel, maybe you could investigate if devel/libinotify is good enough for it. Ciao, David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Re: minidlna media db. refresh
On 2015/01/18 17:42, LÉVAI Dániel wrote: > Hi! > > Has anyone ever had a problem with minidlna not refreshing its media > library automatically (on -current)? That's expected. > Does this only work on Linux w/ inotify? yep. I have set this in pkg.conf to rescan at startup: minidlna_flags="-R" it's appropriate for some uses but not others.
minidlna media db. refresh
Hi! Has anyone ever had a problem with minidlna not refreshing its media library automatically (on -current)? Does this only work on Linux w/ inotify? Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: Minidlna docs
On 2013/10/16 22:25, Ed Ahlsen-Girard wrote: > I just installed this package (14 October snapshot) and there's no man > page, no info page, and the README and INSTALL don't seem to have > anything about how to use the software. > > Where are the docs? > > -- > > Edward Ahlsen-Girard > Ft Walton Beach, FL > There isn't anything worth installing really, but it should be fairly self-explanatory from the sample config.
Minidlna docs
I just installed this package (14 October snapshot) and there's no man page, no info page, and the README and INSTALL don't seem to have anything about how to use the software. Where are the docs? -- Edward Ahlsen-Girard Ft Walton Beach, FL
Re: wip minidlna
On Sat, Mar 16, 2013 at 5:49 PM, Stuart Henderson wrote: > better one.. This works fine for me on amd64 with ffmpeg-20130214 and my Yamaha receiver. Nice touch with the Puffy icon!
Re: wip minidlna
On 2013/03/15 17:49, Stuart Henderson wrote:
> in case anyone's interested, here's an update to minidlna from their
> devel branch, use patch -E, lots of patches to rm.
better one..
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile15 Mar 2013 17:15:24 - 1.5
+++ Makefile16 Mar 2013 16:48:13 -
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/15 17:15:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2013/03/11 11:35:44 espie Exp $
COMMENT= lightweight DLNA/UPnP-AV media server
-V= 1.0.25
-REVISION= 2
-DISTNAME= minidlna_$V_src
-WRKDIST= ${WRKDIR}/minidlna-$V
+V= 1.1.0pre20130315
+#DISTNAME= minidlna_$V_src
+DISTNAME= minidlna-$V
+WRKDIST= ${WRKDIR}/minidlna
PKGNAME= minidlna-$V
CATEGORIES=multimedia
@@ -17,10 +17,23 @@ HOMEPAGE= http://sourceforge.net/project
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += FLAC avcodec avformat avutil c exif id3tag jpeg ogg
+WANTLIB += FLAC avformat avutil c exif id3tag jpeg ogg
WANTLIB += pthread sqlite3 vorbis
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+MASTER_SITES= http://spacehopper.org/mirrors/
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --with-log-path=/var/log/minidlna \
+ --with-db-path=/var/db/minidlna \
+ --with-os-url=http://www.openbsd.org/
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+BUILD_DEPENDS+=${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.11
MODULES= devel/gettext
LIB_DEPENDS= audio/flac \
@@ -29,17 +42,11 @@ LIB_DEPENDS=audio/flac \
graphics/jpeg \
graphics/libexif
-MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- INSTALLPREFIX="${WRKINST}${TRUEPREFIX}"
-CFLAGS+= -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
-do-configure:
- @cd ${WRKSRC} && perl -pi -e 's,/usr/local,${LOCALBASE},g' genconfig.sh
+post-patch:
+ cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION}
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
Index: distinfo
===
RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo10 Oct 2012 10:45:05 - 1.1.1.1
+++ distinfo16 Mar 2013 16:48:13 -
@@ -1,2 +1,2 @@
-SHA256 (minidlna_1.0.25_src.tar.gz) =
FwVg++BCwrvLp4xfFbVPT6wyH/dwSQsjtVeJvkY/KFE=
-SIZE (minidlna_1.0.25_src.tar.gz) = 211756
+SHA256 (minidlna-1.1.0pre20130315.tar.gz) =
fiNiQxtXZ1sVzzSbGMGd/+WdNLZKw8/C52wHGr7b8es=
+SIZE (minidlna-1.1.0pre20130315.tar.gz) = 213327
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 15 Mar 2013 17:15:24 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2013/03/15 17:15:24 sthen Exp $
Makefile.orig Tue Jan 17 22:49:01 2012
-+++ Makefile Fri Mar 15 17:08:35 2013
-@@ -30,7 +30,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdescgen.o upnpsoa
-upnpreplyparse.o minixml.o \
-getifaddr.o daemonize.o upnpglobalvars.o \
-options.o minissdp.o uuid.o upnpevents.o \
-- sql.o utils.o metadata.o scanner.o inotify.o \
-+ sql.o utils.o metadata.o scanner.o \
-tivo_utils.o tivo_beacon.o tivo_commands.o \
-tagutils/textutils.o tagutils/misc.o tagutils/tagutils.o \
-playlist.o image_utils.o albumart.o log.o
-@@ -64,14 +64,14 @@ install-conf:
- $(INSTALL) -d $(ETCINSTALLDIR)
- $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
-
--minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna: $(BASEOBJS) $(LNXOBJS)
- @echo Linking $@
-- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-
-
- testupnpdescgen: $(TESTUPNPDESCGENOBJS)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
-+ $(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
-
- config.h: genconfig.sh
- ./genconfig.sh
-@@ -128,8 +128,4 @@ log.o: log.h
- .SUFFIXES: .c .o
-
- .c.o:
-- @echo Compiling $*.c
-- @$(CC) $(CFLAGS) -o $@ -c $< &
wip minidlna
in case anyone's interested, here's an update to minidlna from their
devel branch, use patch -E, lots of patches to rm.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile15 Mar 2013 17:15:24 - 1.5
+++ Makefile15 Mar 2013 17:47:27 -
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/15 17:15:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2013/03/11 11:35:44 espie Exp $
COMMENT= lightweight DLNA/UPnP-AV media server
-V= 1.0.25
-REVISION= 2
-DISTNAME= minidlna_$V_src
-WRKDIST= ${WRKDIR}/minidlna-$V
+V= 1.1.0pre20130315
+#DISTNAME= minidlna_$V_src
+DISTNAME= minidlna-$V
+WRKDIST= ${WRKDIR}/minidlna
PKGNAME= minidlna-$V
CATEGORIES=multimedia
@@ -17,10 +17,23 @@ HOMEPAGE= http://sourceforge.net/project
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += FLAC avcodec avformat avutil c exif id3tag jpeg ogg
+WANTLIB += FLAC avformat avutil c exif id3tag jpeg ogg
WANTLIB += pthread sqlite3 vorbis
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+MASTER_SITES= http://spacehopper.org/mirrors/
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= \
+ --with-log-path=/var/log/minidlna \
+ --with-db-path=/var/db/minidlna
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+BUILD_DEPENDS+=${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.11
MODULES= devel/gettext
LIB_DEPENDS= audio/flac \
@@ -29,17 +42,15 @@ LIB_DEPENDS=audio/flac \
graphics/jpeg \
graphics/libexif
-MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+xyMAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
INSTALLPREFIX="${WRKINST}${TRUEPREFIX}"
-CFLAGS+= -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ARGS=CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
-do-configure:
- @cd ${WRKSRC} && perl -pi -e 's,/usr/local,${LOCALBASE},g' genconfig.sh
+post-patch:
+ cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION}
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
Index: distinfo
===
RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo10 Oct 2012 10:45:05 - 1.1.1.1
+++ distinfo15 Mar 2013 17:47:27 -
@@ -1,2 +1,2 @@
-SHA256 (minidlna_1.0.25_src.tar.gz) =
FwVg++BCwrvLp4xfFbVPT6wyH/dwSQsjtVeJvkY/KFE=
-SIZE (minidlna_1.0.25_src.tar.gz) = 211756
+SHA256 (minidlna-1.1.0pre20130315.tar.gz) =
fiNiQxtXZ1sVzzSbGMGd/+WdNLZKw8/C52wHGr7b8es=
+SIZE (minidlna-1.1.0pre20130315.tar.gz) = 213327
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 15 Mar 2013 17:15:24 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2013/03/15 17:15:24 sthen Exp $
Makefile.orig Tue Jan 17 22:49:01 2012
-+++ Makefile Fri Mar 15 17:08:35 2013
-@@ -30,7 +30,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdescgen.o upnpsoa
-upnpreplyparse.o minixml.o \
-getifaddr.o daemonize.o upnpglobalvars.o \
-options.o minissdp.o uuid.o upnpevents.o \
-- sql.o utils.o metadata.o scanner.o inotify.o \
-+ sql.o utils.o metadata.o scanner.o \
-tivo_utils.o tivo_beacon.o tivo_commands.o \
-tagutils/textutils.o tagutils/misc.o tagutils/tagutils.o \
-playlist.o image_utils.o albumart.o log.o
-@@ -64,14 +64,14 @@ install-conf:
- $(INSTALL) -d $(ETCINSTALLDIR)
- $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
-
--minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna: $(BASEOBJS) $(LNXOBJS)
- @echo Linking $@
-- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-
-
- testupnpdescgen: $(TESTUPNPDESCGENOBJS)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
-+ $(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
-
- config.h: genconfig.sh
- ./genconfig.sh
-@@ -128,8 +128,4 @@ log.o: log.h
- .SUFFIXES:
Re: NEW: multimedia/minidlna
On Tue, Oct 09, 2012 at 08:36:13PM +0100, Stuart Henderson wrote: > Test reports/comments/OKs welcome - especially tests with > various devices, as I'm only able to test amd64 to my phone with > mediahouse/upnplay apps at present. Very cool! Tested on amd64 as well, with asus transformer and logitech revue as clients (using a few different media clients). Photos + Music + Videos all seem to work well. gabe.
NEW: multimedia/minidlna
Test reports/comments/OKs welcome - especially tests with various devices, as I'm only able to test amd64 to my phone with mediahouse/upnplay apps at present. -- -- -- -- -- MiniDLNA is lightweight server software written in C, capable of serving media files to DLNA/UPnP-AV clients (televisions, tablets, etc). -- -- -- -- -- minidlna.tgz Description: application/tar-gz
