CVS commit: pkgsrc/multimedia/gerbera

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul 11 11:49:48 UTC 2022

Modified Files:
        pkgsrc/multimedia/gerbera: Makefile PLIST distinfo options.mk
        pkgsrc/multimedia/gerbera/patches: patch-src_main.cc
Removed Files:
        pkgsrc/multimedia/gerbera/patches: patch-src_util_logger.h
            patch-src_util_string__converter.cc

Log Message:
gerbera: updated to 1.11.0

Gerbera v1.11.0

NEW Features

Database: Clients and statistics are stored database so restart does not empty client list. Client grouping for play statistics.
Search: Support searching playlists containers
Search: Respect ContainerID when performing search
Import: item class filtering and mapping by file properties allows more sophisticated virtual structure
Transcoding: Support filtering transcoding profiles by resource properties (like codecs) avoids transcoding if client can play files
DLNA: Detect DNLA profiles by resource attributes to specify more detailled profile for handling in client
File type support for WavPack improved: More metadata read with special library if compiled in.
Support Ubuntu 22.04

FIXES

Playlist: Fix parser error
Playlist: Handle end of file properly
Browsing: Sort containers first
Search: search result is sort by title now
Import: Timestamps in future are not stored for containers


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/gerbera/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gerbera/PLIST \
    pkgsrc/multimedia/gerbera/distinfo pkgsrc/multimedia/gerbera/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gerbera/patches/patch-src_main.cc
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/gerbera/patches/patch-src_util_logger.h \
    pkgsrc/multimedia/gerbera/patches/patch-src_util_string__converter.cc

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.3 pkgsrc/multimedia/gerbera/Makefile:1.4
--- pkgsrc/multimedia/gerbera/Makefile:1.3      Mon Apr 18 19:11:43 2022
+++ pkgsrc/multimedia/gerbera/Makefile  Mon Jul 11 11:49:48 2022
@@ -1,22 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2022/04/18 19:11:43 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/11 11:49:48 adam Exp $
 
-GITHUB_PROJECT=        gerbera
-GITHUB_TAG=    v1.9.2
-DISTNAME=      v1.9.2
-PKGNAME=       ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
-PKGREVISION=   2
+DISTNAME=      gerbera-1.11.0
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gerbera/}
-DIST_SUBDIR=   ${GITHUB_PROJECT}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/gerbera/gerbera/
+HOMEPAGE=      https://github.com/gerbera/gerbera
 COMMENT=       UPnP Media Server
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c c++
-
 USE_CMAKE=     yes
+USE_LANGUAGES= c c++
 
 GCC_REQD=      8
 
@@ -40,7 +35,7 @@ EGDIR=                        ${PREFIX}/share/examples/gerber
 CONF_FILES_PERMS+=     ${EGDIR}/config.xml ${PKG_SYSCONFDIR}/config.xml \
                        ${GERBERA_USER} ${GERBERA_GROUP} 0640
 
-FILES_SUBST+=          PKG_HOME=${PKG_HOME.${GERBERA_USER}:Q}
+FILES_SUBST+=          PKG_HOME=${PKG_HOME.${GERBERA_USER}}
 FILES_SUBST+=          GERBERA_GROUP=${GERBERA_GROUP}
 FILES_SUBST+=          GERBERA_USER=${GERBERA_USER}
 FILES_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR}

Index: pkgsrc/multimedia/gerbera/PLIST
diff -u pkgsrc/multimedia/gerbera/PLIST:1.1 pkgsrc/multimedia/gerbera/PLIST:1.2
--- pkgsrc/multimedia/gerbera/PLIST:1.1 Tue Feb  8 06:26:49 2022
+++ pkgsrc/multimedia/gerbera/PLIST     Mon Jul 11 11:49:48 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/02/08 06:26:49 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/07/11 11:49:48 adam Exp $
 bin/gerbera
 man/man1/gerbera.1
 share/applications/gerbera.desktop
@@ -53,20 +53,12 @@ share/gerbera/web/js/jquery.gerbera.tree
 share/gerbera/web/js/jquery.gerbera.tweak.js
 share/gerbera/web/js/md5.js
 share/gerbera/web/mr_reg.xml
-share/gerbera/web/vendor/bootstrap/css/bootstrap-grid.css
-share/gerbera/web/vendor/bootstrap/css/bootstrap-grid.css.map
 share/gerbera/web/vendor/bootstrap/css/bootstrap-grid.min.css
 share/gerbera/web/vendor/bootstrap/css/bootstrap-grid.min.css.map
-share/gerbera/web/vendor/bootstrap/css/bootstrap-reboot.css
-share/gerbera/web/vendor/bootstrap/css/bootstrap-reboot.css.map
 share/gerbera/web/vendor/bootstrap/css/bootstrap-reboot.min.css
 share/gerbera/web/vendor/bootstrap/css/bootstrap-reboot.min.css.map
-share/gerbera/web/vendor/bootstrap/css/bootstrap.css
-share/gerbera/web/vendor/bootstrap/css/bootstrap.css.map
 share/gerbera/web/vendor/bootstrap/css/bootstrap.min.css
 share/gerbera/web/vendor/bootstrap/css/bootstrap.min.css.map
-share/gerbera/web/vendor/bootstrap/js/bootstrap.js
-share/gerbera/web/vendor/bootstrap/js/bootstrap.js.map
 share/gerbera/web/vendor/bootstrap/js/bootstrap.min.js
 share/gerbera/web/vendor/bootstrap/js/bootstrap.min.js.map
 share/gerbera/web/vendor/font-awesome/css/font-awesome.css
@@ -77,9 +69,10 @@ share/gerbera/web/vendor/font-awesome/fo
 share/gerbera/web/vendor/font-awesome/fonts/fontawesome-webfont.ttf
 share/gerbera/web/vendor/font-awesome/fonts/fontawesome-webfont.woff
 share/gerbera/web/vendor/font-awesome/fonts/fontawesome-webfont.woff2
-share/gerbera/web/vendor/jquery/jquery-3.5.1.min.js
+share/gerbera/web/vendor/jquery/jquery-3.6.0.min.js
+share/gerbera/web/vendor/jquery/jquery-3.6.0.min.map
 share/gerbera/web/vendor/jquery/jquery-ui.min.js
-share/gerbera/web/vendor/js-cookie.js
+share/gerbera/web/vendor/js-cookie.min.js
 share/gerbera/web/vendor/lato/LICENCE.md
 share/gerbera/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff
 share/gerbera/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff2
Index: pkgsrc/multimedia/gerbera/distinfo
diff -u pkgsrc/multimedia/gerbera/distinfo:1.1 pkgsrc/multimedia/gerbera/distinfo:1.2
--- pkgsrc/multimedia/gerbera/distinfo:1.1      Tue Feb  8 06:26:49 2022
+++ pkgsrc/multimedia/gerbera/distinfo  Mon Jul 11 11:49:48 2022
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/02/08 06:26:49 khorben Exp $
+$NetBSD: distinfo,v 1.2 2022/07/11 11:49:48 adam Exp $
 
-BLAKE2s (gerbera/v1.9.2.tar.gz) = 1c1a47d6bddc58a3c4c97a1392ecfe5fed5a999889978e9032e0bf1ac713cce7
-SHA512 (gerbera/v1.9.2.tar.gz) = 91c7215b0bae000d4d8b29797947b29609e81c9387547e199936ce385ef679048a7554d24cd80ab73fc83c4288b29fc4928a23add6f67a1da05501c87afdf7a3
-Size (gerbera/v1.9.2.tar.gz) = 3671452 bytes
-SHA1 (patch-src_main.cc) = 2b17435822e244638deaaa51771149a3797e9c74
-SHA1 (patch-src_util_logger.h) = 162ece8bd495402bdcd512f38129de7a66aead19
-SHA1 (patch-src_util_string__converter.cc) = c040b049e5e3015a681cdd5fe2e0f5b50114a55b
+BLAKE2s (gerbera-1.11.0.tar.gz) = b5262860214cd153029adb3895f4c6d332a3ebd40d38f45728af001b80a71eaa
+SHA512 (gerbera-1.11.0.tar.gz) = ae2b3342b3b57ce6d656d0ebadfd73b5f2764f2164314f6b0deac170a82e6861349c37732e6914454918112124038b221dbd4882001b5de51a49326432ccd70f
+Size (gerbera-1.11.0.tar.gz) = 4115178 bytes
+SHA1 (patch-src_main.cc) = b7b59975bc477141c8a92af9200ba2b301e55926
Index: pkgsrc/multimedia/gerbera/options.mk
diff -u pkgsrc/multimedia/gerbera/options.mk:1.1 pkgsrc/multimedia/gerbera/options.mk:1.2
--- pkgsrc/multimedia/gerbera/options.mk:1.1    Tue Feb  8 06:26:49 2022
+++ pkgsrc/multimedia/gerbera/options.mk        Mon Jul 11 11:49:48 2022
@@ -1,5 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/02/08 06:26:49 khorben Exp $
-#
+# $NetBSD: options.mk,v 1.2 2022/07/11 11:49:48 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gerbera
 
@@ -14,25 +13,21 @@ CMAKE_ARGS+=        -DWITH_DEBUG=OFF
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
 CMAKE_ARGS+=   -DWITH_AVCODEC=ON
-
 .  include "../../multimedia/ffmpeg4/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mffmpegthumbnailer)
 CMAKE_ARGS+=   -DWITH_FFMPEGTHUMBNAILER=ON
-
 .  include "../../multimedia/ffmpegthumbnailer/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlastfm)
 CMAKE_ARGS+=   -DWITH_LASTFM=ON
-
 .  include "../../audio/liblastfm/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mjavascript)
 CMAKE_ARGS+=   -DWITH_JS=OFF
-
 .  include "../../lang/libduktape/buildlink3.mk"
 .endif
 

Index: pkgsrc/multimedia/gerbera/patches/patch-src_main.cc
diff -u pkgsrc/multimedia/gerbera/patches/patch-src_main.cc:1.1 pkgsrc/multimedia/gerbera/patches/patch-src_main.cc:1.2
--- pkgsrc/multimedia/gerbera/patches/patch-src_main.cc:1.1     Tue Feb  8 06:26:49 2022
+++ pkgsrc/multimedia/gerbera/patches/patch-src_main.cc Mon Jul 11 11:49:48 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_main.cc,v 1.1 2022/02/08 06:26:49 khorben Exp $
+$NetBSD: patch-src_main.cc,v 1.2 2022/07/11 11:49:48 adam Exp $
 
 Fix build on NetBSD
 
---- src/main.cc.orig   2021-09-30 19:23:27.000000000 +0000
+--- src/main.cc.orig   2022-05-03 17:39:25.000000000 +0000
 +++ src/main.cc
-@@ -266,7 +266,7 @@ int main(int argc, char** argv, char** e
- // mac os x does this differently, setgid and setuid are basically doing the same
+@@ -287,7 +287,7 @@ int main(int argc, char** argv, char** e
+ // macOS does this differently, setgid and setuid are basically doing the same
  // as setresuid and setresgid on linux: setting all of real{u,g}id, effective{u,g}id and saved-set{u,g}id
  // Solaroid systems are likewise missing setresgid and setresuid
 -#if defined(__APPLE__) || defined(SOLARIS) || defined(__CYGWIN__) || defined(__HAIKU__)
 +#if defined(__APPLE__) || defined(SOLARIS) || defined(__CYGWIN__) || defined(__HAIKU__) || defined(__NetBSD__)
              // set group-ids, then add. groups, last user-ids, all need to succeed
-             if (0 != setgid(user_id->pw_gid) || 0 != initgroups(user_id->pw_name, user_id->pw_gid) || 0 != setuid(user_id->pw_uid)) {
+             if (0 != setgid(userId->pw_gid) || 0 != initgroups(userId->pw_name, userId->pw_gid) || 0 != setuid(userId->pw_uid)) {
  #else