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

Collapse All | Expand All

(-)b/audio/forked-daapd/Makefile (-22 / +29 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	forked-daapd
4
PORTNAME=	forked-daapd
5
PORTVERSION=	24.1
5
DISTVERSION=	27.2
6
PORTREVISION=	10
7
CATEGORIES=	audio
6
CATEGORIES=	audio
7
MASTER_SITES=	https://github.com/ejurgensen/forked-daapd/releases/download/${DISTVERSION}/
8
8
9
MAINTAINER=	takumiiinn@gmail.com
9
MAINTAINER=	takumiiinn@gmail.com
10
COMMENT=	DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server
10
COMMENT=	DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server
Lines 12-37 COMMENT= DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server Link Here
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
BUILD_DEPENDS=	antlr3:devel/antlr3
16
LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
15
LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
17
		libavahi-client.so:net/avahi-app \
16
		libavahi-client.so:net/avahi-app \
18
		libavcodec.so:multimedia/ffmpeg \
17
		libavcodec.so:multimedia/ffmpeg \
19
		libconfuse.so:devel/libconfuse \
18
		libconfuse.so:devel/libconfuse \
20
		libevent.so:devel/libevent \
19
		libcurl.so:ftp/curl \
20
		libevent_pthreads.so:devel/libevent \
21
		libgcrypt.so:security/libgcrypt \
22
		libgpg-error.so:security/libgpg-error \
23
		libjson-c.so:devel/json-c \
21
		libgcrypt.so:security/libgcrypt \
24
		libgcrypt.so:security/libgcrypt \
22
		libinotify.so:devel/libinotify \
25
		libinotify.so:devel/libinotify \
23
		libmxml.so:textproc/mxml \
26
		libmxml.so:textproc/mxml \
24
		libunistring.so:devel/libunistring
27
		libplist.so:devel/libplist \
25
28
		libsodium.so:security/libsodium \
26
USE_GITHUB=	yes
29
		libunistring.so:devel/libunistring \
27
GH_ACCOUNT=	ejurgensen
30
		libwebsockets.so:net/libwebsockets
28
31
29
USES=		autoreconf gettext gmake gperf iconv libtool localbase pathfix pkgconfig sqlite
32
USES=		gnome gmake gperf iconv:wchar_t libtool localbase pathfix \
33
		pkgconfig sqlite tar:xz
34
USE_GNOME=	libxml2
35
USE_LDCONFIG=	${PREFIX}/lib/forked-daapd
30
36
31
GNU_CONFIGURE=	yes
37
GNU_CONFIGURE=	yes
32
INSTALL_TARGET=	install-strip
33
USE_LDCONFIG=	${LOCALBASE}/lib/forked-daapd
34
CONFIGURE_ARGS+=--localstatedir=/var
35
38
36
USE_RC_SUBR=	${PORTNAME}
39
USE_RC_SUBR=	${PORTNAME}
37
SUB_FILES=	pkg-message
40
SUB_FILES=	pkg-message
Lines 39-59 SUB_FILES= pkg-message Link Here
39
USERS=		daapd
42
USERS=		daapd
40
GROUPS=		daapd
43
GROUPS=		daapd
41
44
42
OPTIONS_DEFINE=	ALSA ITUNES LASTFM MPD
45
OPTIONS_DEFINE=		ALSA ITUNES MPD PULSEAUDIO
43
OPTIONS_DEFAULT=ITUNES LASTFM MPD
46
OPTIONS_DEFAULT=	ITUNES MPD
44
47
45
ITUNES_DESC=	iTunes XML support
48
ITUNES_DESC=		iTunes XML support
46
MPD_DESC=	Music Player Daemon protocol support
49
MPD_DESC=		Music Player Daemon protocol support
47
50
48
ALSA_CONFIGURE_WITH=	alsa
49
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
51
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
50
ITUNES_CONFIGURE_ENABLE=itunes
52
ALSA_CONFIGURE_WITH=	alsa
51
ITUNES_LIB_DEPENDS=	libplist.so:devel/libplist
53
52
LASTFM_CONFIGURE_ENABLE=lastfm
54
ITUNES_CONFIGURE_ENABLE=	itunes
53
LASTFM_LIB_DEPENDS=	libcurl.so:ftp/curl
55
54
MPD_CONFIGURE_ENABLE=	mpd
56
MPD_CONFIGURE_ENABLE=		mpd
57
58
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
59
PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
55
60
56
post-install:
61
post-install:
62
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/forked-daapd/forked-daapd-sqlext.so
63
	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc/forked-daapd
57
	@${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample
64
	@${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample
58
65
59
.include <bsd.port.mk>
66
.include <bsd.port.mk>
(-)b/audio/forked-daapd/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (ejurgensen-forked-daapd-24.1_GH0.tar.gz) = 2d0353b318c10dc53928b40010ffeaca1264c8219dff15d715953ded2c3ba73d
1
TIMESTAMP = 1600867959
2
SIZE (ejurgensen-forked-daapd-24.1_GH0.tar.gz) = 344140
2
SHA256 (forked-daapd-27.2.tar.xz) = 27294a893253d232161f4521fc42147e65324ce5a13fcf550b537100375277bb
3
SIZE (forked-daapd-27.2.tar.xz) = 3335304
(-)a/audio/forked-daapd/files/patch-dmap_common.h (-11 lines)
Removed Link Here
1
--- src/dmap_common.h.orig	2016-05-06 17:50:14 UTC
2
+++ src/dmap_common.h
3
@@ -46,7 +46,7 @@ dmap_get_fields_table(int *nfields);
4
 
5
 /* From dmap_fields.gperf - keep in sync, don't alter */
6
 const struct dmap_field *
7
-dmap_find_field (register const char *str, register unsigned int len);
8
+dmap_find_field (register const char *str, register size_t len);
9
 
10
 
11
 void
(-)a/audio/forked-daapd/files/patch-ffmpeg4 (-43 lines)
Removed Link Here
1
https://github.com/ejurgensen/forked-daapd/commit/5afed60a42fe
2
https://github.com/ejurgensen/forked-daapd/commit/e7f888645fd6
3
https://github.com/ejurgensen/forked-daapd/commit/eec98e3b7e88
4
5
--- src/artwork.c.orig	2016-05-06 17:50:14 UTC
6
+++ src/artwork.c
7
@@ -445,7 +445,7 @@ artwork_rescale(struct evbuffer *evbuf, AVFormatContex
8
   avcodec_get_context_defaults3(dst, NULL);
9
 
10
   if (dst_fmt->flags & AVFMT_GLOBALHEADER)
11
-    dst->flags |= CODEC_FLAG_GLOBAL_HEADER;
12
+    dst->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
13
 
14
   dst->codec_id = dst_fmt->video_codec;
15
   dst->codec_type = AVMEDIA_TYPE_VIDEO;
16
--- src/transcode.c.orig	2016-05-06 17:50:14 UTC
17
+++ src/transcode.c
18
@@ -26,7 +26,6 @@
19
 
20
 #include <libavcodec/avcodec.h>
21
 #include <libavformat/avformat.h>
22
-#include <libavfilter/avfiltergraph.h>
23
 #include <libavfilter/buffersink.h>
24
 #include <libavfilter/buffersrc.h>
25
 #include <libavutil/opt.h>
26
@@ -560,7 +559,7 @@ flush_encoder(struct encode_ctx *ctx, unsigned int str
27
 
28
   DPRINTF(E_DBG, L_XCODE, "Flushing output stream #%u encoder\n", stream_index);
29
 
30
-  if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & CODEC_CAP_DELAY))
31
+  if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & AV_CODEC_CAP_DELAY))
32
     return;
33
 
34
   do
35
@@ -804,7 +803,7 @@ open_output(struct encode_ctx *ctx, struct decode_ctx 
36
 	}
37
 
38
       if (ctx->ofmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
39
-	enc_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
40
+	enc_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
41
     }
42
 
43
   // Notice, this will not write WAV header (so we do that manually)
(-)b/audio/forked-daapd/pkg-plist (-1 / +56 lines)
Lines 2-6 Link Here
2
lib/forked-daapd/forked-daapd-sqlext.so
2
lib/forked-daapd/forked-daapd-sqlext.so
3
man/man8/forked-daapd.8.gz
3
man/man8/forked-daapd.8.gz
4
sbin/forked-daapd
4
sbin/forked-daapd
5
%%DATADIR%%/htdocs/admin.html
6
%%DATADIR%%/htdocs/admin/css/forked-daapd.css
7
%%DATADIR%%/htdocs/admin/js/forked-daapd.js
8
%%DATADIR%%/htdocs/admin/vendor/axios/axios.js
9
%%DATADIR%%/htdocs/admin/vendor/axios/axios.map
10
%%DATADIR%%/htdocs/admin/vendor/axios/axios.min.js
11
%%DATADIR%%/htdocs/admin/vendor/axios/axios.min.map
12
%%DATADIR%%/htdocs/admin/vendor/bulma/bulma.css
13
%%DATADIR%%/htdocs/admin/vendor/bulma/bulma.css.map
14
%%DATADIR%%/htdocs/admin/vendor/bulma/bulma.min.css
15
%%DATADIR%%/htdocs/admin/vendor/fontawesome/css/all.css
16
%%DATADIR%%/htdocs/admin/vendor/fontawesome/css/all.min.css
17
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.eot
18
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.svg
19
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.ttf
20
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.woff
21
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-brands-400.woff2
22
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.eot
23
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.svg
24
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.ttf
25
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.woff
26
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-regular-400.woff2
27
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.eot
28
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.svg
29
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.ttf
30
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.woff
31
%%DATADIR%%/htdocs/admin/vendor/fontawesome/webfonts/fa-solid-900.woff2
32
%%DATADIR%%/htdocs/admin/vendor/vue/vue.js
33
%%DATADIR%%/htdocs/admin/vendor/vue/vue.min.js
34
%%DATADIR%%/htdocs/android-chrome-96x96.png
35
%%DATADIR%%/htdocs/apple-touch-icon.png
36
%%DATADIR%%/htdocs/browserconfig.xml
37
%%DATADIR%%/htdocs/favicon-16x16.png
38
%%DATADIR%%/htdocs/favicon-32x32.png
39
%%DATADIR%%/htdocs/favicon.ico
40
%%DATADIR%%/htdocs/index.html
41
%%DATADIR%%/htdocs/mstile-150x150.png
42
%%DATADIR%%/htdocs/player/css/app.css
43
%%DATADIR%%/htdocs/player/css/app.css.map
44
%%DATADIR%%/htdocs/player/css/chunk-vendors.css
45
%%DATADIR%%/htdocs/player/css/chunk-vendors.css.map
46
%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.eot
47
%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.ttf
48
%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.woff
49
%%DATADIR%%/htdocs/player/fonts/materialdesignicons-webfont.woff2
50
%%DATADIR%%/htdocs/player/img/materialdesignicons-webfont.svg
51
%%DATADIR%%/htdocs/player/js/app-legacy.js
52
%%DATADIR%%/htdocs/player/js/app-legacy.js.map
53
%%DATADIR%%/htdocs/player/js/app.js
54
%%DATADIR%%/htdocs/player/js/app.js.map
55
%%DATADIR%%/htdocs/player/js/chunk-vendors-legacy.js
56
%%DATADIR%%/htdocs/player/js/chunk-vendors-legacy.js.map
57
%%DATADIR%%/htdocs/player/js/chunk-vendors.js
58
%%DATADIR%%/htdocs/player/js/chunk-vendors.js.map
59
%%DATADIR%%/htdocs/safari-pinned-tab.svg
60
%%DATADIR%%/htdocs/site.webmanifest
5
@dir(daapd,daapd,700) /var/cache/forked-daapd/libspotify
61
@dir(daapd,daapd,700) /var/cache/forked-daapd/libspotify
6
@dir(daapd,daapd,700) /var/cache/forked-daapd
62
@dir(daapd,daapd,700) /var/cache/forked-daapd
7
- 

Return to bug 249556