CVS commit: pkgsrc/multimedia/gerbera

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 10 06:17:17 UTC 2024

Modified Files:
        pkgsrc/multimedia/gerbera: Makefile options.mk
        pkgsrc/multimedia/gerbera/files: gerbera.sh

Log Message:
gerbera: fix two problems

1. startup script didn't start program demonized
2. ffmpegthumbnailer option causes problems at startup, disable it by
   default

>From Dave Tyson on pkgsrc-users.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/gerbera/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/gerbera/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/gerbera/files/gerbera.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gerbera/Makefile
diff -u pkgsrc/multimedia/gerbera/Makefile:1.26 pkgsrc/multimedia/gerbera/Makefile:1.27
--- pkgsrc/multimedia/gerbera/Makefile:1.26     Wed May 29 16:33:43 2024
+++ pkgsrc/multimedia/gerbera/Makefile  Wed Jul 10 06:17:17 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2024/05/29 16:33:43 adam Exp $
+# $NetBSD: Makefile,v 1.27 2024/07/10 06:17:17 wiz Exp $
 
 DISTNAME=      gerbera-1.12.1
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gerbera/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/multimedia/gerbera/options.mk
diff -u pkgsrc/multimedia/gerbera/options.mk:1.3 pkgsrc/multimedia/gerbera/options.mk:1.4
--- pkgsrc/multimedia/gerbera/options.mk:1.3    Fri Apr 26 15:28:23 2024
+++ pkgsrc/multimedia/gerbera/options.mk        Wed Jul 10 06:17:17 2024
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2024/04/26 15:28:23 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2024/07/10 06:17:17 wiz Exp $
 
 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"
 

Index: pkgsrc/multimedia/gerbera/files/gerbera.sh
diff -u pkgsrc/multimedia/gerbera/files/gerbera.sh:1.2 pkgsrc/multimedia/gerbera/files/gerbera.sh:1.3
--- pkgsrc/multimedia/gerbera/files/gerbera.sh:1.2      Fri Dec 23 21:44:20 2022
+++ pkgsrc/multimedia/gerbera/files/gerbera.sh  Wed Jul 10 06:17:17 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: gerbera.sh,v 1.2 2022/12/23 21:44:20 gutteridge Exp $
+# $NetBSD: gerbera.sh,v 1.3 2024/07/10 06:17:17 wiz Exp $
 #
 
 # PROVIDE: gerbera
@@ -14,7 +14,7 @@ load_rc_config_var gerbera_username gerb
 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