Re: Gerbera from pkgsrc 2024Q2 on NetBSD 10.0_STABLE (amd64)

[Dave Tyson <dtyson%anduin.org.uk@localhost>]

On Tue, 2024-07-09 at 07:03 +0200, Thomas Klausner wrote:
> On Mon, Jul 08, 2024 at 11:34:37PM +0100, Dave Tyson wrote:
> > Just to update this thread. I tried compiling from pkgsrc and got
> > the
> > same result. I then remembered I had an issue with the previous
> > version
> > (1.12.0) and noted that I needed to remove one of the default
> > options
> > from the build.
> > 
> > putting PKG_OPTIONS.gerbera += -ffmpegthumbnailer in /etc/mk.conf
> > and
> > doing a make replace resulted in a working package.
> > 
> > I think there is something wrong with the internal logic which
> > generates the default config.xml and it fails to add the components
> > for
> > the ffmpegthumbnailer by default and so the internal config checker
> > bombs on startup. Removing the option fixes the problem, but a
> > alternative is to manually edit the generated config to add the
> > extra
> > lines.
> > 
> > Note also the default gerbera startup file which you install in
> > /etc/rc.d does not include the -d option to daemonise it on startup...
> 
> Can you send a tested patch for these two problems, please?
> 
> Thanks,
>  Thomas

Enclosed patches against pkgsrc-2024Q2

diff -u files/gerbera.sh.orig files/gerbera.sh 
--- files/gerbera.sh.orig	2022-12-23 21:44:20.000000000 +0000
+++ files/gerbera.sh	2024-07-09 20:25:56.917624531 +0100
@@ -14,7 +14,7 @@
 command="@PREFIX@/bin/gerbera"
 logfile="@VARBASE@/log/${name}.log"
 pidfile="@PKG_HOME@/${name}.pid"
-command_args="-u ${gerbera_username:-@GERBERA_USER@} -m @PKG_HOME@ -P ${pidfile} -l ${logfile} -c @PKG_SYSCONFDIR@/config.xml"
+command_args="-d -u ${gerbera_username:-@GERBERA_USER@} -m @PKG_HOME@ -P ${pidfile} -l ${logfile} -c @PKG_SYSCONFDIR@/config.xml"
 
 if [ -f @SYSCONFBASE@/rc.subr ]; then
 	load_rc_config $name

 diff -u options.mk.orig  options.mk                                         
--- options.mk.orig	2024-04-26 16:28:23.000000000 +0100
+++ options.mk	2024-07-09 20:29:39.310762204 +0100
@@ -3,7 +3,7 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gerbera
 
 PKG_SUPPORTED_OPTIONS=	debug ffmpeg ffmpegthumbnailer javascript matroska systemd
-PKG_SUGGESTED_OPTIONS=	ffmpegthumbnailer javascript matroska
+PKG_SUGGESTED_OPTIONS=	javascript matroska
 
 .include "../../mk/bsd.options.mk"


Gregs suggestion about staging a fixed version on wip is a good one,
but I think it would be better to move to the newly released Gerbera
2.2.0. I haven't used wip for a few years and I think my certificate
will not longer work + plus I have forgotten my passphrase :-)

Dave