View | Details | Raw Unified | Return to bug 248475 | Differences between
and this patch

Collapse All | Expand All

(-)b/GIDs (-1 / +1 lines)
Lines 819-825 librespeed:*:874: Link Here
819
# free: 876
819
# free: 876
820
# free: 877
820
# free: 877
821
# free: 878
821
# free: 878
822
# free: 879
822
gerbera:*:879:
823
pyspf-milter:*:880:
823
pyspf-milter:*:880:
824
ultimaker:*:881:
824
ultimaker:*:881:
825
midpoint:*:882:
825
midpoint:*:882:
(-)b/UIDs (-1 / +1 lines)
Lines 824-830 librespeed:*:874:874::0:0:LibreSpeed user:/nonexistent:/usr/sbin/nologin Link Here
824
# free: 876
824
# free: 876
825
# free: 877
825
# free: 877
826
# free: 878
826
# free: 878
827
# free: 879
827
gerbera:*:879:879::0:0:Gerbera DLNA Media Server:/nonexistent:/usr/sbin/nologin
828
pyspf-milter:*:880:880::0:0:pyspf-milter:/nonexistent:/usr/sbin/nologin
828
pyspf-milter:*:880:880::0:0:pyspf-milter:/nonexistent:/usr/sbin/nologin
829
ultimaker:*:881:881::0:0:Ultimaker user:/nonexistent:/usr/sbin/nologin
829
ultimaker:*:881:881::0:0:Ultimaker user:/nonexistent:/usr/sbin/nologin
830
midpoint:*:882:882::0:0:midPoint user:/var/db/midpoint:/usr/sbin/nologin
830
midpoint:*:882:882::0:0:midPoint user:/var/db/midpoint:/usr/sbin/nologin
(-)b/net/gerbera/Makefile (+80 lines)
Added Link Here
1
# $FreeBSD$
2
3
PORTNAME=	gerbera
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	1.6.1
6
CATEGORIES=	net multimedia
7
8
MAINTAINER=	daniel.engberg.lists@pyret.net
9
COMMENT=	Media server compatible with DLNA and UPnP
10
11
LICENSE=	GPLv2
12
13
LIB_DEPENDS=	libupnp.so:devel/upnp \
14
		libfmt.so:devel/libfmt \
15
		libspdlog.so:devel/spdlog \
16
		libpugixml.so:textproc/pugixml \
17
		libinotify.so:devel/libinotify
18
19
USES=		cmake compiler:c++17-lang iconv localbase:ldflags sqlite
20
21
USE_GITHUB=	yes
22
23
CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
24
TEST_TARGET=	test
25
26
USERS=		gerbera
27
GROUPS=		gerbera
28
USE_RC_SUBR=	gerbera
29
SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
30
PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
31
SUB_FILES=	pkg-message
32
33
OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
34
			LIBMAGIC MATROSKA TAGLIB TEST
35
OPTIONS_DEFAULT=	CURL DUKTAPE EXIV2 FFMPEG LIBMAGIC TAGLIB
36
37
CURL_DESC=		Support for online services via cURL
38
DUKTAPE_DESC=		Javascript support for custom import scripts
39
FFMPEGTHUMBNAILER_DESC=	Support for thumbnail generation
40
LIBMAGIC_DESC=		Identify file mime types via libmagic
41
MATROSKA_DESC=		Extract video/mkv metadata via libmatroska
42
TAGLIB_DESC=		Extract audio file metadata via taglib
43
44
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
45
CURL_CMAKE_BOOL=	WITH_CURL
46
47
DEBUG_CMAKE_BOOL=	WITH_DEBUG
48
49
DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
50
DUKTAPE_CMAKE_BOOL=	WITH_JS
51
52
EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
53
EXIV2_CMAKE_BOOL=	WITH_EXIV2
54
55
FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
56
			libavutil.so:multimedia/ffmpeg
57
FFMPEG_CMAKE_BOOL=	WITH_AVCODEC
58
59
FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
60
FFMPEGTHUMBNAILER_CMAKE_BOOL=	WITH_FFMPEGTHUMBNAILER
61
62
LIBMAGIC_LIB_DEPENDS=	libmagic.so:sysutils/file
63
LIBMAGIC_CMAKE_BOOL=	WITH_MAGIC
64
65
MATROSKA_LIB_DEPENDS=	libmatroska.so:multimedia/libmatroska
66
MATROSKA_CMAKE_BOOL=	WITH_MATROSKA
67
68
TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
69
TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
70
71
TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
72
TEST_CMAKE_BOOL=	WITH_TESTS
73
74
post-install:
75
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera
76
	@${MKDIR} ${STAGEDIR}/var/db/gerbera
77
	@${MKDIR} ${STAGEDIR}/var/log/gerbera
78
	@${STAGEDIR}${PREFIX}/bin/gerbera -f /var/db/gerbera --create-config > ${STAGEDIR}${PREFIX}/etc/gerbera-config.xml.sample
79
80
.include <bsd.port.mk>
(-)b/net/gerbera/distinfo (+3 lines)
Added Link Here
1
TIMESTAMP = 1599354769
2
SHA256 (gerbera-gerbera-v1.6.1_GH0.tar.gz) = 9bb119ee422c8e7a053c309256215a8899dfd6707f6b93496e6facea7978ac7c
3
SIZE (gerbera-gerbera-v1.6.1_GH0.tar.gz) = 3061089
(-)b/net/gerbera/files/gerbera.in (+53 lines)
Added Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD$
4
#
5
6
# PROVIDE: gerbera
7
# REQUIRE: DAEMON
8
# KEYWORD: shutdown
9
10
#
11
# Add the following line to /etc/rc.conf to enable gerbera:
12
# gerbera_enable (bool):	Set to "NO" by default.
13
#				Set it to "YES" to enable gerbera.
14
# gerbera_flags (str):		Custom additional arguments to be passed
15
#				to gerbera (default empty).
16
# gerbera_conf_dir (str):	Directory where ${name} configuration
17
#				data is stored.
18
19
. /etc/rc.subr
20
21
name="gerbera"
22
rcvar="gerbera_enable"
23
24
load_rc_config ${name}
25
26
: ${gerbera_enable="NO"}
27
: ${gerbera_user:="%%USER%%"}
28
: ${gerbera_group:="%%GROUP%%"}
29
: ${gerbera_conf_dir="/usr/local/etc"}
30
31
start_precmd=gerbera_precmd
32
stop_postcmd=gerbera_stop_postcmd
33
34
procname="%%PREFIX%%/bin/${name}"
35
pidfile="/var/run/gerbera/gerbera.pid"
36
required_files="${gerbera_conf_dir}/gerbera-config.xml"
37
38
command="/usr/sbin/daemon"
39
command_args="-f -t ${name} -p ${pidfile} ${procname} -c ${required_files} -l /var/log/gerbera/gerbera.log ${gerbera_args}"
40
41
gerbera_precmd()
42
{
43
        local rundir=${pidfile%/*}
44
        if [ ! -d $rundir ] ; then
45
                install -d -m 0755 -o gerbera -g gerbera $rundir
46
        fi
47
}
48
49
gerbera_stop_postcmd() {
50
        rm -f "$rundir"
51
}
52
53
run_rc_command "$1"
(-)b/net/gerbera/files/patch-CMakeLists.txt (+8 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2020-09-06 01:54:18 UTC
2
+++ CMakeLists.txt
3
@@ -528,4 +528,4 @@ INSTALL(FILES
4
         ${PROJECT_SOURCE_DIR}/config/mysql.sql
5
         ${PROJECT_SOURCE_DIR}/config/sqlite3.sql
6
         DESTINATION share/gerbera)
7
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION share/man/man1)
8
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/gerbera.1 DESTINATION man/man1)
(-)b/net/gerbera/files/patch-test_core_test__server.cc (+20 lines)
Added Link Here
1
--- test/core/test_server.cc.orig	2020-07-27 06:07:30 UTC
2
+++ test/core/test_server.cc
3
@@ -51,17 +51,6 @@ TEST_F(ServerTest, ServerOutputsHelpInformation)
4
     ASSERT_THAT(output.c_str(), HasSubstr(expectedOutput.c_str()));
5
 }
6
 
7
-TEST_F(ServerTest, ServerOutputsCompileInformationIncludingGit)
8
-{
9
-    fs::path cmd = fs::path(CMAKE_BINARY_DIR) / "gerbera --compile-info 2>&1";
10
-    std::string output = exec(cmd.c_str());
11
-
12
-    ASSERT_THAT(output, HasSubstr("Compile info\n-------------\nWITH_"));
13
-    ASSERT_THAT(output, HasSubstr("Git info:\n-------------\n"));
14
-    ASSERT_THAT(output, HasSubstr("Git Branch: "));
15
-    ASSERT_THAT(output, HasSubstr("Git Commit: "));
16
-}
17
-
18
 TEST_F(ServerTest, GeneratesFullConfigFromServerCommand)
19
 {
20
     // simple check to ensure complete generation from server
(-)b/net/gerbera/files/pkg-message.in (+11 lines)
Added Link Here
1
[
2
{ type: install
3
  message: <<EOM
4
  Edit /etc/rc.conf(.local) to start Gerbera automatically at system
5
  startup. Command line arguments can be set via gerbera_args.
6
7
  A sample configuration file is installed at the follow location:
8
  %%PREFIX%%/etc/gerbera-config.xml.sample
9
EOM
10
}
11
]
(-)b/net/gerbera/pkg-descr (+3 lines)
Added Link Here
1
Gerbera is a DLNA compatible media server and a continuation of MediaTomb
2
3
WWW: https://gerbera.io/
(-)b/net/gerbera/pkg-plist (-1 / +86 lines)
Added Link Here
0
- 
1
bin/gerbera
2
%%DATADIR%%/js/common.js
3
%%DATADIR%%/js/import.js
4
%%DATADIR%%/js/import_structured.js
5
%%DATADIR%%/js/playlists.js
6
%%DATADIR%%/mappings.xml
7
%%DATADIR%%/mysql.sql
8
%%DATADIR%%/sqlite3.sql
9
%%DATADIR%%/web/README.md
10
%%DATADIR%%/web/assets/theme/colors.css
11
%%DATADIR%%/web/assets/theme/gerbera-logo-white.png
12
%%DATADIR%%/web/assets/theme/gerbera.css
13
%%DATADIR%%/web/cds.xml
14
%%DATADIR%%/web/cm.xml
15
%%DATADIR%%/web/disabled.html
16
%%DATADIR%%/web/favicon.ico
17
%%DATADIR%%/web/icons/mt-icon120.bmp
18
%%DATADIR%%/web/icons/mt-icon120.jpg
19
%%DATADIR%%/web/icons/mt-icon120.png
20
%%DATADIR%%/web/icons/mt-icon32.bmp
21
%%DATADIR%%/web/icons/mt-icon32.jpg
22
%%DATADIR%%/web/icons/mt-icon32.png
23
%%DATADIR%%/web/icons/mt-icon48.bmp
24
%%DATADIR%%/web/icons/mt-icon48.jpg
25
%%DATADIR%%/web/icons/mt-icon48.png
26
%%DATADIR%%/web/index.html
27
%%DATADIR%%/web/js/gerbera-app.module.js
28
%%DATADIR%%/web/js/gerbera-auth.module.js
29
%%DATADIR%%/web/js/gerbera-autoscan.module.js
30
%%DATADIR%%/web/js/gerbera-clients.module.js
31
%%DATADIR%%/web/js/gerbera-items.module.js
32
%%DATADIR%%/web/js/gerbera-menu.module.js
33
%%DATADIR%%/web/js/gerbera-trail.module.js
34
%%DATADIR%%/web/js/gerbera-tree.module.js
35
%%DATADIR%%/web/js/gerbera-updates.module.js
36
%%DATADIR%%/web/js/jquery.gerbera.autoscan.js
37
%%DATADIR%%/web/js/jquery.gerbera.clients.js
38
%%DATADIR%%/web/js/jquery.gerbera.editor.js
39
%%DATADIR%%/web/js/jquery.gerbera.items.js
40
%%DATADIR%%/web/js/jquery.gerbera.toast.js
41
%%DATADIR%%/web/js/jquery.gerbera.trail.js
42
%%DATADIR%%/web/js/jquery.gerbera.tree.js
43
%%DATADIR%%/web/js/md5.js
44
%%DATADIR%%/web/mr_reg.xml
45
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.css
46
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.css.map
47
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.min.css
48
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.min.css.map
49
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.css
50
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.css.map
51
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.min.css
52
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.min.css.map
53
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.css
54
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.css.map
55
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.min.css
56
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.min.css.map
57
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.bundle.js
58
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.bundle.js.map
59
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.bundle.min.js
60
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.bundle.min.js.map
61
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.js
62
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.js.map
63
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.min.js
64
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.min.js.map
65
%%DATADIR%%/web/vendor/font-awesome/css/font-awesome.css
66
%%DATADIR%%/web/vendor/font-awesome/css/font-awesome.min.css
67
%%DATADIR%%/web/vendor/font-awesome/fonts/FontAwesome.otf
68
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.eot
69
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.svg
70
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.ttf
71
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff
72
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff2
73
%%DATADIR%%/web/vendor/jquery/jquery-3.4.0.min.js
74
%%DATADIR%%/web/vendor/jquery/jquery-ui.min.js
75
%%DATADIR%%/web/vendor/js-cookie.js
76
%%DATADIR%%/web/vendor/lato/LICENCE.md
77
%%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff
78
%%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff2
79
%%DATADIR%%/web/vendor/popper/popper.js
80
%%DATADIR%%/web/vendor/tether/tether.min.js
81
man/man1/gerbera.1.gz
82
@owner %%USER%%
83
@group %%GROUP%%
84
@dir /var/db/gerbera
85
@dir /var/log/gerbera
86
@sample(gerbera,gerbera,0640) /usr/local/etc/gerbera-config.xml.sample

Return to bug 248475