From nobody Mon Feb 13 11:16:36 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFhcP1hPBz3q4Sm; Mon, 13 Feb 2023 11:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFhcP00zbz3py6; Mon, 13 Feb 2023 11:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676286997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJ1eFUlmls9FWH7KuvaNGFUP0d1Ybpcj182uhGjRuSE=; b=iN+0wUpFpX54JTkMF5Yub6Kn913NhsqVqGlmcU/n45Xg5YwighgQm/bTSVov4/uYojQBfX jcjyZzFxeZxJFDjr1thip/48/ES9MrKBPFQkkmV3SQwZJbQZg6j6tJR8ljAT0SVtkpW3jo m47rU0jUKecaXAxys/AuPONhGfbTQwF0GrpABS0pIsm2+Dw8+Ot68uh0ldHyeLeMJ07hbj hSyBuIg3E5+9nz1X1VQiUuLsC77JJ7ict04+y4KccKgRIdffyxkOS4LPcx4pHWW6SuayC4 wqVm5qCEhOpa6BdsX5/s5QbDcXgt7VlW0vpGvPd7hyZF6PloPfb5hIhzWCap+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676286997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJ1eFUlmls9FWH7KuvaNGFUP0d1Ybpcj182uhGjRuSE=; b=R/JOyIru4Fh1MTNhfh+7Jm9MHSmhdo4LNg9vPUE/8J7FlPw2QsVOO3l/28lPkloZflNMK8 nQwfJ/r106PfBG6Jzv5XkFeNnc7vttz2AzklG6orKwoXyR8fw9bmdhPB1KLnpu7U+gqu26 38a5WCb7ejL/c2St8bV6HFYGJWHlUSw9TraTvoFo0jaXjVYJ2y6CNae0nWC33E4gyz7mYc BLvCpolKo+C12uNeGg61LkfrShNCj9GNk7S3IwFihnMJbXdx6bxsnxI2g51fSrYpgOiY1E mbNy8D8yQ0s3BnXwxPgtxd98iYlE7Bc2yz6LCiBkPLTaBgfQ+1uBm3hqnUVHaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676286997; a=rsa-sha256; cv=none; b=Lro9Gg8B3uMrqS5NueS6bO8VC6hPds2f05BYSjpS14mqbQ5Z4j8U7CuHWFitZFsQg5tCtC epasgm30XInePp1IiBtNLY+cy5g1ZSV4SmMrffYTGkIitNQeotNnaiHFidXhlLyePANHBY ic7gvOI7CeyaoCPglawtgWuwB0W4MRzD56m7bBI2AJ7QnbPEeR9ra8OJrV9nlPch1O4QnA Ez09jpZQ9moHmxC3iQyoC7yu6xJAupZNtwHjlDawhhKD5/hb2o4yLEMVojtlGtw0oUg/R5 rDMRWexCw1UU102SUPF/Q+7IlRQt9VRqFuHabzy8wnxTPkhf0b7gfPC2X0erdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFhcN69Z5zGNF; Mon, 13 Feb 2023 11:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DBGaXG009885; Mon, 13 Feb 2023 11:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DBGaxn009884; Mon, 13 Feb 2023 11:16:36 GMT (envelope-from git) Date: Mon, 13 Feb 2023 11:16:36 GMT Message-Id: <202302131116.31DBGaxn009884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: e3160483b6f3 - main - audio/owntone: add more options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3160483b6f31fd472e88875854fec61a14ecc41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3160483b6f31fd472e88875854fec61a14ecc41 commit e3160483b6f31fd472e88875854fec61a14ecc41 Author: Dirk Meyer AuthorDate: 2023-02-13 11:16:14 +0000 Commit: Dirk Meyer CommitDate: 2023-02-13 11:16:14 +0000 audio/owntone: add more options --- audio/owntone/Makefile | 42 ++++++++++++++++++++++++++++-------------- audio/owntone/pkg-plist | 7 +++---- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/audio/owntone/Makefile b/audio/owntone/Makefile index 4a298ea8c221..3130d206b33d 100644 --- a/audio/owntone/Makefile +++ b/audio/owntone/Makefile @@ -1,6 +1,6 @@ PORTNAME= owntone DISTVERSION= 28.5 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/owntone/owntone-server/releases/download/${DISTVERSION}/ @@ -11,13 +11,13 @@ WWW= https://github.com/owntone/owntone-server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ - libavahi-client.so:net/avahi-app \ +LIB_DEPENDS= libavahi-client.so:net/avahi-app \ libavcodec.so:multimedia/ffmpeg \ libconfuse.so:devel/libconfuse \ libcurl.so:ftp/curl \ libevent_pthreads.so:devel/libevent \ libgcrypt.so:security/libgcrypt \ + libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error \ libjson-c.so:devel/json-c \ libinotify.so:devel/libinotify \ @@ -25,47 +25,61 @@ LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libplist-2.0.so:devel/libplist \ libsodium.so:security/libsodium \ libunistring.so:devel/libunistring \ - libwebsockets.so:net/libwebsockets \ libprotobuf-c.so:devel/protobuf-c \ libuuid.so:misc/e2fsprogs-libuuid -USES= tar:xz localbase libtool iconv:wchar_t pkgconfig gnome gmake gperf \ - sqlite gnome pathfix +USES= tar:xz localbase libtool iconv:wchar_t pkgconfig gnome gmake \ + gperf sqlite gnome pathfix USE_GNOME= libxml2 GNU_CONFIGURE= yes - +CONFIGURE_ARGS= --disable-install_systemd \ + --with-owntone-user=${OWNTONE_USER} \ + --with-owntone-group=${OWNTONE_USER} USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message -USERS= daapd -GROUPS= daapd +OWNTONE_USER?= daapd +USERS?= daapd +GROUPS?= daapd -OPTIONS_DEFINE= ALSA ITUNES MPD PULSEAUDIO NLS DOCS -OPTIONS_DEFAULT= ITUNES MPD NLS DOCS +OPTIONS_DEFINE= ITUNES MPD AIRPLAY2 CHROMECAST WEBINTERFACE \ + ALSA PULSEAUDIO NLS DOCS +OPTIONS_DEFAULT= ITUNES MPD AIRPLAY2 CHROMECAST WEBINTERFACE \ + ALSA NLS DOCS +NO_OPTIONS_SORT=yes +OPTIONS_SUB=yes +AIRPLAY2_DESC= Prefer AirPlay 2 ITUNES_DESC= iTunes XML support +CHROMECAST_DESC= Chromecast support MPD_DESC= Music Player Daemon protocol support +WEBINTERFACE_DESC= Install web interface + +AIRPLAY2_CONFIGURE_ENABLE= preferairplay2 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_WITH= alsa ITUNES_CONFIGURE_ENABLE= itunes +CHROMECAST_CONFIGURE_ENABLE= chromecast + MPD_CONFIGURE_ENABLE= mpd PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio +WEBINTERFACE_CONFIGURE_ENABLE= webinterface +WEBINTERFACE_CONFIGURE_WITH= libwebsockets +WEBINTERFACE_LIB_DEPENDS= libwebsockets.so:net/libwebsockets + NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/owntone/owntone-sqlext.so - ${RM} ${STAGEDIR}${PREFIX}/etc/systemd/system/owntone.service ${MV} ${STAGEDIR}${PREFIX}/etc/owntone.conf \ ${STAGEDIR}${PREFIX}/etc/owntone.conf.sample - ${REINPLACE_CMD} -i '' -e 's|uid = "owntone"|uid = "daapd"|' \ - ${STAGEDIR}${PREFIX}/etc/owntone.conf.sample .include diff --git a/audio/owntone/pkg-plist b/audio/owntone/pkg-plist index 026cc05b7c4f..2dc65b023db1 100644 --- a/audio/owntone/pkg-plist +++ b/audio/owntone/pkg-plist @@ -1,5 +1,4 @@ @sample etc/owntone.conf.sample -etc/systemd/system/owntone@.service lib/owntone/owntone-sqlext.so man/man8/owntone.8.gz sbin/owntone @@ -33,13 +32,13 @@ sbin/owntone %%DATADIR%%/htdocs/android-chrome-192x192.png %%DATADIR%%/htdocs/android-chrome-512x512.png %%DATADIR%%/htdocs/apple-touch-icon.png -%%DATADIR%%/htdocs/assets/index.css -%%DATADIR%%/htdocs/assets/index.js +%%WEBINTERFACE%%%%DATADIR%%/htdocs/assets/index.css +%%WEBINTERFACE%%%%DATADIR%%/htdocs/assets/index.js %%DATADIR%%/htdocs/browserconfig.xml %%DATADIR%%/htdocs/favicon-16x16.png %%DATADIR%%/htdocs/favicon-32x32.png %%DATADIR%%/htdocs/favicon.ico -%%DATADIR%%/htdocs/index.html +%%WEBINTERFACE%%%%DATADIR%%/htdocs/index.html %%DATADIR%%/htdocs/mstile-150x150.png %%DATADIR%%/htdocs/safari-pinned-tab.svg %%DATADIR%%/htdocs/site.webmanifest