Date: Sun, 15 Mar 2026 09:20:32 +0000 From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7311823d54bf - main - net/gerbera: Update to 3.2.0 Message-ID: <69b679e0.3fb10.164551f2@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7311823d54bf635f1ee9e19a1f186ac36f0cb142 commit 7311823d54bf635f1ee9e19a1f186ac36f0cb142 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2026-03-15 08:41:20 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2026-03-15 09:18:19 +0000 net/gerbera: Update to 3.2.0 * Avoid pulling in devel/libinotify on FreeBSD 15+ Changelog: https://github.com/gerbera/gerbera/releases/tag/v3.2.0 --- net/gerbera/Makefile | 25 +++++++++++++----------- net/gerbera/distinfo | 6 +++--- net/gerbera/files/extra-patch-FreeBSD-15-inotify | 13 ++++++++++++ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile index 56653f79a8ef..37e677395a0c 100644 --- a/net/gerbera/Makefile +++ b/net/gerbera/Makefile @@ -1,7 +1,6 @@ PORTNAME= gerbera DISTVERSIONPREFIX= v -DISTVERSION= 3.1.1 -PORTREVISION= 1 +DISTVERSION= 3.2.0 CATEGORIES= net multimedia MAINTAINER= diizzy@FreeBSD.org @@ -11,12 +10,12 @@ WWW= https://gerbera.io/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md +BUILD_DEPENDS= cxxopts>0:devel/cxxopts 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 + libpugixml.so:textproc/pugixml USES= cmake compiler:c++17-lang iconv localbase:ldflags \ pkgconfig sqlite @@ -32,11 +31,12 @@ SUB_LIST= USER=${USERS} GROUP=${GROUPS} PLIST_SUB= USER=${USERS} GROUP=${GROUPS} -CMAKE_OFF= WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD WITH_ZIP +CMAKE_OFF= WITH_EXIF WITH_LASTFM WITH_MATROSKA WITH_MYSQL WITH_SYSTEMD \ + WITH_ZIP CMAKE_ON= WITH_MAGIC OPTIONS_DEFINE= CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \ - MATROSKA TAGLIB TEST + TAGLIB TEST OPTIONS_DEFAULT= CURL DUKTAPE EXIV2 FFMPEG TAGLIB LIBNPUPNP OPTIONS_SINGLE= UPNPLIB @@ -47,7 +47,6 @@ 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 @@ -74,10 +73,6 @@ 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 @@ -87,6 +82,14 @@ TEST_TEST_TARGET= test TEST_IMPLIES= CURL DUKTAPE TEST_ENV= LC_ALL=C.UTF-8 CTEST_PARALLEL_LEVEL=${MAKE_JOBS_NUMBER} +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500050 +LIB_DEPENDS+= libinotify.so:devel/libinotify +.else +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-FreeBSD-15-inotify +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera @${MKDIR} ${STAGEDIR}/var/db/gerbera diff --git a/net/gerbera/distinfo b/net/gerbera/distinfo index 75386346364c..6dc06cfea6b4 100644 --- a/net/gerbera/distinfo +++ b/net/gerbera/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1768854253 -SHA256 (gerbera-gerbera-v3.1.1_GH0.tar.gz) = 0556a6dc17da2043d88bee934c43a7475403da920a9b07a12fb48ac6dfc58ea3 -SIZE (gerbera-gerbera-v3.1.1_GH0.tar.gz) = 9959135 +TIMESTAMP = 1773495520 +SHA256 (gerbera-gerbera-v3.2.0_GH0.tar.gz) = c55ec5cddc952e2563586ac76014be072c9dedb5094c6675889afa90b8df23e2 +SIZE (gerbera-gerbera-v3.2.0_GH0.tar.gz) = 10058527 diff --git a/net/gerbera/files/extra-patch-FreeBSD-15-inotify b/net/gerbera/files/extra-patch-FreeBSD-15-inotify new file mode 100644 index 000000000000..20b56674c223 --- /dev/null +++ b/net/gerbera/files/extra-patch-FreeBSD-15-inotify @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2026-03-14 13:58:28 UTC ++++ CMakeLists.txt +@@ -666,8 +666,8 @@ if(WITH_INOTIFY) + endif() + + if(WITH_INOTIFY) +- find_package(Inotify REQUIRED) +- target_link_libraries(libgerbera PUBLIC Inotify::Inotify) ++# find_package(Inotify REQUIRED) ++# target_link_libraries(libgerbera PUBLIC Inotify::Inotify) + target_compile_definitions(libgerbera PUBLIC HAVE_INOTIFY) + endif() +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b679e0.3fb10.164551f2>