From b320f229d2808ecd371122f94dc6c4df3750ef2f Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Fri, 25 Sep 2020 00:40:45 +0200 Subject: [PATCH] forkeddaapd272-2 forkeddaapd272-2 Signed-off-by: Daniel Engberg --- audio/forked-daapd/Makefile | 50 +++++++++-------- audio/forked-daapd/distinfo | 5 +- audio/forked-daapd/files/patch-dmap_common.h | 11 ---- audio/forked-daapd/files/patch-ffmpeg4 | 43 --------------- audio/forked-daapd/pkg-plist | 56 ++++++++++++++++++++ 5 files changed, 87 insertions(+), 78 deletions(-) delete mode 100644 audio/forked-daapd/files/patch-dmap_common.h delete mode 100644 audio/forked-daapd/files/patch-ffmpeg4 diff --git a/audio/forked-daapd/Makefile b/audio/forked-daapd/Makefile index 307f40aa5f9a..0a925d828668 100644 --- a/audio/forked-daapd/Makefile +++ b/audio/forked-daapd/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= forked-daapd -PORTVERSION= 24.1 -PORTREVISION= 10 +DISTVERSION= 27.2 CATEGORIES= audio +MASTER_SITES= https://github.com/ejurgensen/forked-daapd/releases/download/${DISTVERSION}/ MAINTAINER= takumiiinn@gmail.com COMMENT= DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server @@ -12,26 +12,28 @@ COMMENT= DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= antlr3:devel/antlr3 LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libavahi-client.so:net/avahi-app \ libavcodec.so:multimedia/ffmpeg \ libconfuse.so:devel/libconfuse \ - libevent.so:devel/libevent \ + libcurl.so:ftp/curl \ + libevent_pthreads.so:devel/libevent \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ + libjson-c.so:devel/json-c \ libgcrypt.so:security/libgcrypt \ libinotify.so:devel/libinotify \ libmxml.so:textproc/mxml \ - libunistring.so:devel/libunistring - -USE_GITHUB= yes -GH_ACCOUNT= ejurgensen + libplist.so:devel/libplist \ + libsodium.so:security/libsodium \ + libunistring.so:devel/libunistring \ + libwebsockets.so:net/libwebsockets -USES= autoreconf gettext gmake gperf iconv libtool localbase pathfix pkgconfig sqlite +USES= gnome gmake gperf iconv:wchar_t libtool localbase pathfix \ + pkgconfig sqlite tar:xz +USE_GNOME= libxml2 GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= ${LOCALBASE}/lib/forked-daapd -CONFIGURE_ARGS+=--localstatedir=/var USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message @@ -39,21 +41,25 @@ SUB_FILES= pkg-message USERS= daapd GROUPS= daapd -OPTIONS_DEFINE= ALSA ITUNES LASTFM MPD -OPTIONS_DEFAULT=ITUNES LASTFM MPD +OPTIONS_DEFINE= ALSA ITUNES MPD PULSEAUDIO +OPTIONS_DEFAULT= ITUNES MPD -ITUNES_DESC= iTunes XML support -MPD_DESC= Music Player Daemon protocol support +ITUNES_DESC= iTunes XML support +MPD_DESC= Music Player Daemon protocol support -ALSA_CONFIGURE_WITH= alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ITUNES_CONFIGURE_ENABLE=itunes -ITUNES_LIB_DEPENDS= libplist.so:devel/libplist -LASTFM_CONFIGURE_ENABLE=lastfm -LASTFM_LIB_DEPENDS= libcurl.so:ftp/curl -MPD_CONFIGURE_ENABLE= mpd +ALSA_CONFIGURE_WITH= alsa + +ITUNES_CONFIGURE_ENABLE= itunes + +MPD_CONFIGURE_ENABLE= mpd + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_CONFIGURE_WITH= pulseaudio post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/forked-daapd/forked-daapd-sqlext.so + @${RM} -r ${STAGEDIR}${PREFIX}/share/doc/forked-daapd @${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample .include diff --git a/audio/forked-daapd/distinfo b/audio/forked-daapd/distinfo index f5fcef3c14df..d733f904c536 100644 --- a/audio/forked-daapd/distinfo +++ b/audio/forked-daapd/distinfo @@ -1,2 +1,3 @@ -SHA256 (ejurgensen-forked-daapd-24.1_GH0.tar.gz) = 2d0353b318c10dc53928b40010ffeaca1264c8219dff15d715953ded2c3ba73d -SIZE (ejurgensen-forked-daapd-24.1_GH0.tar.gz) = 344140 +TIMESTAMP = 1600867959 +SHA256 (forked-daapd-27.2.tar.xz) = 27294a893253d232161f4521fc42147e65324ce5a13fcf550b537100375277bb +SIZE (forked-daapd-27.2.tar.xz) = 3335304 diff --git a/audio/forked-daapd/files/patch-dmap_common.h b/audio/forked-daapd/files/patch-dmap_common.h deleted file mode 100644 index b367370c0a2e..000000000000 --- a/audio/forked-daapd/files/patch-dmap_common.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dmap_common.h.orig 2016-05-06 17:50:14 UTC -+++ src/dmap_common.h -@@ -46,7 +46,7 @@ dmap_get_fields_table(int *nfields); - - /* From dmap_fields.gperf - keep in sync, don't alter */ - const struct dmap_field * --dmap_find_field (register const char *str, register unsigned int len); -+dmap_find_field (register const char *str, register size_t len); - - - void diff --git a/audio/forked-daapd/files/patch-ffmpeg4 b/audio/forked-daapd/files/patch-ffmpeg4 deleted file mode 100644 index 728615ca17f5..000000000000 --- a/audio/forked-daapd/files/patch-ffmpeg4 +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/ejurgensen/forked-daapd/commit/5afed60a42fe -https://github.com/ejurgensen/forked-daapd/commit/e7f888645fd6 -https://github.com/ejurgensen/forked-daapd/commit/eec98e3b7e88 - ---- src/artwork.c.orig 2016-05-06 17:50:14 UTC -+++ src/artwork.c -@@ -445,7 +445,7 @@ artwork_rescale(struct evbuffer *evbuf, AVFormatContex - avcodec_get_context_defaults3(dst, NULL); - - if (dst_fmt->flags & AVFMT_GLOBALHEADER) -- dst->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ dst->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - dst->codec_id = dst_fmt->video_codec; - dst->codec_type = AVMEDIA_TYPE_VIDEO; ---- src/transcode.c.orig 2016-05-06 17:50:14 UTC -+++ src/transcode.c -@@ -26,7 +26,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -560,7 +559,7 @@ flush_encoder(struct encode_ctx *ctx, unsigned int str - - DPRINTF(E_DBG, L_XCODE, "Flushing output stream #%u encoder\n", stream_index); - -- if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & CODEC_CAP_DELAY)) -+ if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & AV_CODEC_CAP_DELAY)) - return; - - do -@@ -804,7 +803,7 @@ open_output(struct encode_ctx *ctx, struct decode_ctx - } - - if (ctx->ofmt_ctx->oformat->flags & AVFMT_GLOBALHEADER) -- enc_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ enc_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - } - - // Notice, this will not write WAV header (so we do that manually) diff --git a/audio/forked-daapd/pkg-plist b/audio/forked-daapd/pkg-plist index 1b1ce98a8376..f2cc58829ce3 100644 --- a/audio/forked-daapd/pkg-plist +++ b/audio/forked-daapd/pkg-plist @@ -2,5 +2,61 @@ lib/forked-daapd/forked-daapd-sqlext.so man/man8/forked-daapd.8.gz sbin/forked-daapd +%%DATADIR%%/htdocs/admin.html +%%DATADIR%%/htdocs/admin/css/forked-daapd.css +%%DATADIR%%/htdocs/admin/js/forked-daapd.js +%%DATADIR%%/htdocs/admin/vendor/axios/axios.js +%%DATADIR%%/htdocs/admin/vendor/axios/axios.map +%%DATADIR%%/htdocs/admin/vendor/axios/axios.min.js +%%DATADIR%%/htdocs/admin/vendor/axios/axios.min.map +%%DATADIR%%/htdocs/admin/vendor/bulma/bulma.css +%%DATADIR%%/htdocs/admin/vendor/bulma/bulma.css.map +%%DATADIR%%/htdocs/admin/vendor/bulma/bulma.min.css +%%DATADIR%%/htdocs/admin/vendor/fontawesome/css/all.css +%%DATADIR%%/htdocs/admin/vendor/fontawesome/css/all.min.css +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.eot +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.svg +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.ttf +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.woff +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.woff2 +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.eot +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.svg +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.ttf +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.woff +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.woff2 +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.eot +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.svg +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.ttf +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.woff +%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.woff2 +%%DATADIR%%/htdocs/admin/vendor/vue/vue.js +%%DATADIR%%/htdocs/admin/vendor/vue/vue.min.js +%%DATADIR%%/htdocs/android-chrome-96x96.png +%%DATADIR%%/htdocs/apple-touch-icon.png +%%DATADIR%%/htdocs/browserconfig.xml +%%DATADIR%%/htdocs/favicon-16x16.png +%%DATADIR%%/htdocs/favicon-32x32.png +%%DATADIR%%/htdocs/favicon.ico +%%DATADIR%%/htdocs/index.html +%%DATADIR%%/htdocs/mstile-150x150.png +%%DATADIR%%/htdocs/player/css/app.css +%%DATADIR%%/htdocs/player/css/app.css.map +%%DATADIR%%/htdocs/player/css/chunk-vendors.css +%%DATADIR%%/htdocs/player/css/chunk-vendors.css.map +%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.eot +%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.ttf +%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.woff +%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.woff2 +%%DATADIR%%/htdocs/player/img/materialdesignicons-webfont.svg +%%DATADIR%%/htdocs/player/js/app-legacy.js +%%DATADIR%%/htdocs/player/js/app-legacy.js.map +%%DATADIR%%/htdocs/player/js/app.js +%%DATADIR%%/htdocs/player/js/app.js.map +%%DATADIR%%/htdocs/player/js/chunk-vendors-legacy.js +%%DATADIR%%/htdocs/player/js/chunk-vendors-legacy.js.map +%%DATADIR%%/htdocs/player/js/chunk-vendors.js +%%DATADIR%%/htdocs/player/js/chunk-vendors.js.map +%%DATADIR%%/htdocs/safari-pinned-tab.svg +%%DATADIR%%/htdocs/site.webmanifest @dir(daapd,daapd,700) /var/cache/forked-daapd/libspotify @dir(daapd,daapd,700) /var/cache/forked-daapd -- 2.28.0