diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile index 43debaebdbae..9fda03969b78 100644 --- a/net/gerbera/Makefile +++ b/net/gerbera/Makefile @@ -1,96 +1,96 @@ PORTNAME= gerbera DISTVERSIONPREFIX= v -DISTVERSION= 2.6.1 +DISTVERSION= 3.0.0 PORTREVISION= 1 CATEGORIES= net multimedia MAINTAINER= diizzy@FreeBSD.org COMMENT= Media server compatible with DLNA and UPnP WWW= https://gerbera.io/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libfmt.so:devel/libfmt \ libicui18n.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libspdlog.so:devel/spdlog \ libpugixml.so:textproc/pugixml \ libinotify.so:devel/libinotify USES= cmake compiler:c++17-lang iconv localbase:ldflags \ pkgconfig sqlite USE_GITHUB= yes USE_RC_SUBR= gerbera USERS= gerbera GROUPS= gerbera SUB_FILES= pkg-message SUB_LIST= USER=${USERS} GROUP=${GROUPS} PLIST_SUB= USER=${USERS} GROUP=${GROUPS} CMAKE_OFF= WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD CMAKE_ON= WITH_MAGIC OPTIONS_DEFINE= CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \ MATROSKA TAGLIB TEST OPTIONS_DEFAULT= CURL DUKTAPE EXIV2 FFMPEG TAGLIB LIBNPUPNP OPTIONS_SINGLE= UPNPLIB OPTIONS_SINGLE_UPNPLIB= LIBNPUPNP LIBUPNP CURL_DESC= Support for online services via cURL DUKTAPE_DESC= Javascript support for custom import scripts FFMPEGTHUMBNAILER_DESC= Support for thumbnail generation LIBNPUPNP_DESC= Use high performance libnpupnp library LIBUPNP_DESC= Use libupnp library MATROSKA_DESC= Extract video/mkv metadata via libmatroska TAGLIB_DESC= Extract audio file metadata via taglib CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CMAKE_BOOL= WITH_CURL DEBUG_CMAKE_BOOL= WITH_DEBUG DUKTAPE_LIB_DEPENDS= libduktape.so:lang/duktape-lib DUKTAPE_CMAKE_BOOL= WITH_JS EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_CMAKE_BOOL= WITH_EXIV2 FFMPEGTHUMBNAILER_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer FFMPEGTHUMBNAILER_CMAKE_BOOL= WITH_FFMPEGTHUMBNAILER FFMPEGTHUMBNAILER_IMPLIES= FFMPEG FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_AVCODEC LIBNPUPNP_LIB_DEPENDS= libnpupnp.so:net/libnpupnp LIBNPUPNP_CMAKE_BOOL= WITH_NPUPNP LIBUPNP_LIB_DEPENDS= libupnp.so:devel/upnp MATROSKA_LIB_DEPENDS= libebml.so:textproc/libebml \ libmatroska.so:multimedia/libmatroska MATROSKA_CMAKE_BOOL= WITH_MATROSKA TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CMAKE_BOOL= WITH_TAGLIB TEST_BUILD_DEPENDS= googletest>=0:devel/googletest TEST_CMAKE_BOOL= WITH_TESTS TEST_TEST_TARGET= test TEST_IMPLIES= CURL DUKTAPE TEST_ENV= LC_ALL=C.UTF-8 CTEST_PARALLEL_LEVEL=${MAKE_JOBS_NUMBER} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera @${MKDIR} ${STAGEDIR}/var/db/gerbera @${MKDIR} ${STAGEDIR}/var/log/gerbera @${STAGEDIR}${PREFIX}/bin/gerbera -f /var/db/gerbera --create-config > ${STAGEDIR}${PREFIX}/etc/gerbera-config.xml.sample .include diff --git a/net/gerbera/distinfo b/net/gerbera/distinfo index 5eee063a0a5f..8f969cfb7560 100644 --- a/net/gerbera/distinfo +++ b/net/gerbera/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755307156 -SHA256 (gerbera-gerbera-v2.6.1_GH0.tar.gz) = 6a7ed1c73bd86bdddd76bcb6c4bcd2e42788a20eb1f3165e0ea9f456abccd3ed -SIZE (gerbera-gerbera-v2.6.1_GH0.tar.gz) = 9874477 +TIMESTAMP = 1762628864 +SHA256 (gerbera-gerbera-v3.0.0_GH0.tar.gz) = d7934a2318f45330deb2ed1b589bd37b49f42f7929a9d11650349d17c998f920 +SIZE (gerbera-gerbera-v3.0.0_GH0.tar.gz) = 9916800 diff --git a/net/gerbera/files/patch-CMakeLists.txt b/net/gerbera/files/patch-CMakeLists.txt index 3147907fc8c2..1e64031e42fd 100644 --- a/net/gerbera/files/patch-CMakeLists.txt +++ b/net/gerbera/files/patch-CMakeLists.txt @@ -1,23 +1,27 @@ ---- CMakeLists.txt.orig 2025-08-05 02:13:11 UTC +--- CMakeLists.txt.orig 2025-11-08 19:08:45 UTC +++ CMakeLists.txt -@@ -815,13 +815,13 @@ endif() +@@ -906,15 +906,15 @@ endif() ) endif() --set(BASH_COMPLETION_DIR "/usr/share/bash-completion/completions") +-if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") +- set(BASH_COMPLETION_DIR "/usr/share/bash-completion/completions") - --install(FILES -- scripts/gerbera-completion.sh -- DESTINATION "${BASH_COMPLETION_DIR}" -- RENAME gerbera --) -+#set(BASH_COMPLETION_DIR "/usr/share/bash-completion/completions") +- install(FILES +- scripts/gerbera-completion.sh +- DESTINATION "${BASH_COMPLETION_DIR}" +- RENAME gerbera +- ) +-endif() ++#if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") ++# set(BASH_COMPLETION_DIR "/usr/share/bash-completion/completions") +# -+#install(FILES -+# scripts/gerbera-completion.sh -+# DESTINATION "${BASH_COMPLETION_DIR}" -+# RENAME gerbera -+#) ++# install(FILES ++# scripts/gerbera-completion.sh ++# DESTINATION "${BASH_COMPLETION_DIR}" ++# RENAME gerbera ++# ) ++#endif() set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${DEBIAN_EXTRA_FILES}) diff --git a/net/gerbera/files/patch-src_web_config__load.cc b/net/gerbera/files/patch-src_web_config__load.cc deleted file mode 100644 index 34ff795ddafc..000000000000 --- a/net/gerbera/files/patch-src_web_config__load.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- src/web/config_load.cc.orig 2025-08-15 13:41:10 UTC -+++ src/web/config_load.cc -@@ -150,7 +150,11 @@ void Web::ConfigLoad::setValue(Json::Value& item, cons - template - void Web::ConfigLoad::setValue(Json::Value& item, const T& value) - { -+#if FMT_VERSION >= 120000 -+ static_assert(fmt::is_formattable::value, "T must be formattable"); -+#else - static_assert(fmt::has_formatter::value, "T must be formattable"); -+#endif - item[CONFIG_LOAD_VALUE] = fmt::to_string(value); - } - diff --git a/net/gerbera/pkg-plist b/net/gerbera/pkg-plist index 4e5a185f9030..3acc78534d3c 100644 --- a/net/gerbera/pkg-plist +++ b/net/gerbera/pkg-plist @@ -1,90 +1,98 @@ bin/gerbera +%%DATADIR%%/config2.xsd %%DATADIR%%/js/audio.js %%DATADIR%%/js/common.js +%%DATADIR%%/js/image.js %%DATADIR%%/js/import.js %%DATADIR%%/js/metadata.js %%DATADIR%%/js/playlists.js +%%DATADIR%%/js/trailer.js +%%DATADIR%%/js/video.js %%DATADIR%%/mysql-drop.sql %%DATADIR%%/mysql-upgrade.xml %%DATADIR%%/mysql.sql +%%DATADIR%%/postgres-drop.sql +%%DATADIR%%/postgres-upgrade.xml +%%DATADIR%%/postgres.sql +%%DATADIR%%/sqlite3-drop.sql %%DATADIR%%/sqlite3-upgrade.xml %%DATADIR%%/sqlite3.sql %%DATADIR%%/web/README.md %%DATADIR%%/web/assets/gerbera-config-expert.json %%DATADIR%%/web/assets/gerbera-config-minimal.json %%DATADIR%%/web/assets/gerbera-config-standard.json %%DATADIR%%/web/assets/theme/colors.css %%DATADIR%%/web/assets/theme/gerbera-logo-white.png %%DATADIR%%/web/assets/theme/gerbera.css %%DATADIR%%/web/assets/theme/home-bg.jpg %%DATADIR%%/web/css/upnp.css %%DATADIR%%/web/disabled.html %%DATADIR%%/web/favicon.ico %%DATADIR%%/web/icons/mt-icon120.bmp %%DATADIR%%/web/icons/mt-icon120.jpg %%DATADIR%%/web/icons/mt-icon120.png %%DATADIR%%/web/icons/mt-icon32.bmp %%DATADIR%%/web/icons/mt-icon32.jpg %%DATADIR%%/web/icons/mt-icon32.png %%DATADIR%%/web/icons/mt-icon48.bmp %%DATADIR%%/web/icons/mt-icon48.jpg %%DATADIR%%/web/icons/mt-icon48.png %%DATADIR%%/web/index.html %%DATADIR%%/web/js/gerbera-app.module.js %%DATADIR%%/web/js/gerbera-auth.module.js %%DATADIR%%/web/js/gerbera-autoscan.module.js %%DATADIR%%/web/js/gerbera-clients.module.js %%DATADIR%%/web/js/gerbera-config.module.js %%DATADIR%%/web/js/gerbera-items.module.js %%DATADIR%%/web/js/gerbera-menu.module.js %%DATADIR%%/web/js/gerbera-trail.module.js %%DATADIR%%/web/js/gerbera-tree.module.js %%DATADIR%%/web/js/gerbera-tweak.module.js %%DATADIR%%/web/js/gerbera-updates.module.js %%DATADIR%%/web/js/jquery.gerbera.autoscan.js %%DATADIR%%/web/js/jquery.gerbera.clients.js %%DATADIR%%/web/js/jquery.gerbera.config.js %%DATADIR%%/web/js/jquery.gerbera.editor.js %%DATADIR%%/web/js/jquery.gerbera.items.js %%DATADIR%%/web/js/jquery.gerbera.toast.js %%DATADIR%%/web/js/jquery.gerbera.trail.js %%DATADIR%%/web/js/jquery.gerbera.tree.js %%DATADIR%%/web/js/jquery.gerbera.tweak.js %%DATADIR%%/web/upnp/cds.xml %%DATADIR%%/web/upnp/cm.xml %%DATADIR%%/web/upnp/mr_reg.xml %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-grid.min.css %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-grid.min.css.map %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-reboot.min.css %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap-reboot.min.css.map %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap.min.css %%DATADIR%%/web/vendor/bootstrap-4.6.2/css/bootstrap.min.css.map %%DATADIR%%/web/vendor/bootstrap-4.6.2/js/bootstrap.min.js %%DATADIR%%/web/vendor/bootstrap-4.6.2/js/bootstrap.min.js.map %%DATADIR%%/web/vendor/font-awesome/css/font-awesome.css %%DATADIR%%/web/vendor/font-awesome/css/font-awesome.min.css %%DATADIR%%/web/vendor/font-awesome/fonts/FontAwesome.otf %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.eot %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.svg %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.ttf %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff %%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff2 %%DATADIR%%/web/vendor/jquery/jquery-3.7.1.min.js %%DATADIR%%/web/vendor/jquery/jquery-3.7.1.min.map %%DATADIR%%/web/vendor/jquery/jquery-ui.min.js %%DATADIR%%/web/vendor/js-cookie.min.js %%DATADIR%%/web/vendor/lato/LICENCE.md %%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff %%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff2 %%DATADIR%%/web/vendor/md5.min.js %%DATADIR%%/web/vendor/md5.min.js.map %%DATADIR%%/web/vendor/popper/popper.min.js %%DATADIR%%/web/vendor/popper/popper.min.js.map %%DATADIR%%/web/vendor/tether-2.0.0/tether.min.css %%DATADIR%%/web/vendor/tether-2.0.0/tether.min.js share/man/man1/gerbera.1.gz @owner %%USER%% @group %%GROUP%% @dir /var/db/gerbera @dir /var/log/gerbera @sample(gerbera,gerbera,0640) /usr/local/etc/gerbera-config.xml.sample