Page MenuHomeFreeBSD
Files F141025183

D15555.id43071.diff
No OneTemporary
Actions

D15555.id43071.diff
View Options

Index: head/audio/idjc/Makefile
===================================================================
--- head/audio/idjc/Makefile
+++ head/audio/idjc/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= idjc
-PORTVERSION= 0.8.16
-PORTREVISION= 9
+PORTVERSION= 0.8.17
CATEGORIES= audio python
-MASTER_SITES= SF/idjc/idjc/0.8
+MASTER_SITES= SF/idjc
MAINTAINER= sbruno@FreeBSD.org
COMMENT= Shoutcast/Icecast DJ Console
@@ -23,7 +22,9 @@
libmp3lame.so:audio/lame \
libvorbis.so:audio/libvorbis \
libsamplerate.so:audio/libsamplerate \
- libshout-idjc.so:audio/shout-idjc
+ libshout-idjc.so:audio/shout-idjc \
+ libopus.so:audio/opus
+
RUN_DEPENDS= oggenc:audio/vorbis-tools \
${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
Index: head/audio/idjc/distinfo
===================================================================
--- head/audio/idjc/distinfo
+++ head/audio/idjc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (idjc-0.8.16.tar.gz) = 7a63ccab729a46175a482661c66352308b5a3d048c4abfd0af22db652b037ba8
-SIZE (idjc-0.8.16.tar.gz) = 2774611
+TIMESTAMP = 1527092891
+SHA256 (idjc-0.8.17.tar.gz) = ce0c5517c298cfc7bb8d604c4accf98831ee1ecc2e97108e2f33c0f510ae7d34
+SIZE (idjc-0.8.17.tar.gz) = 2803719
Index: head/audio/idjc/files/patch-c_avcodec__encoder.c
===================================================================
--- head/audio/idjc/files/patch-c_avcodec__encoder.c
+++ head/audio/idjc/files/patch-c_avcodec__encoder.c
@@ -1,70 +0,0 @@
-Removed in 0.8.17, see https://sourceforge.net/p/idjc/code/ci/7ca28dc311b4/
-
---- c/avcodec_encoder.c.orig 2016-02-27 13:24:52 UTC
-+++ c/avcodec_encoder.c
-@@ -34,6 +34,21 @@
- #ifndef HAVE_AV_FRAME_UNREF
- #define av_frame_unref avcodec_get_frame_defaults
- #endif
-+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
-+#endif
-+#ifndef AV_INPUT_BUFFER_MIN_SIZE
-+#define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE
-+#endif
-+#ifndef AV_CODEC_CAP_DELAY
-+#define AV_CODEC_CAP_DELAY CODEC_CAP_DELAY
-+#endif
-+#ifndef AV_CODEC_CAP_SMALL_LAST_FRAME
-+#define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME
-+#endif
-+#ifndef AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-+#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE
-+#endif
-
- #define BYTE_ALIGNMENT (8)
-
-@@ -115,14 +130,14 @@ static void live_avcodec_encoder_main(struct encoder *
-
- // allocate the input buffer
- s->inbufsize = c->frame_size * c->channels * av_get_bytes_per_sample(c->sample_fmt);
-- if (posix_memalign((void *)&s->inbuf, BYTE_ALIGNMENT, s->inbufsize + FF_INPUT_BUFFER_PADDING_SIZE)) {
-+ if (posix_memalign((void *)&s->inbuf, BYTE_ALIGNMENT, s->inbufsize + AV_INPUT_BUFFER_PADDING_SIZE)) {
- fprintf(stderr, "live_avcodec_encoder_main: malloc failure\n");
- goto bailout;
- }
-- memset(s->inbuf + s->inbufsize, '\0', FF_INPUT_BUFFER_PADDING_SIZE);
-+ memset(s->inbuf + s->inbufsize, '\0', AV_INPUT_BUFFER_PADDING_SIZE);
-
- // allocate the output buffer
-- if (posix_memalign((void *)&s->avpkt.data, BYTE_ALIGNMENT, FF_MIN_BUFFER_SIZE)) {
-+ if (posix_memalign((void *)&s->avpkt.data, BYTE_ALIGNMENT, AV_INPUT_BUFFER_MIN_SIZE)) {
- fprintf(stderr, "live_avcodec_encoder_main: malloc failure\n");
- goto bailout;
- }
-@@ -192,11 +207,11 @@ static void live_avcodec_encoder_main(struct encoder *
-
- encoder_ip_data_free(id);
- } else {
-- memset(s->inbuf, '\0', FF_INPUT_BUFFER_PADDING_SIZE);
-+ memset(s->inbuf, '\0', AV_INPUT_BUFFER_PADDING_SIZE);
- s->pkt_flags |= PF_FINAL;
- }
-
-- if (final && (s->codec->capabilities | CODEC_CAP_DELAY)) {
-+ if (final && (s->codec->capabilities | AV_CODEC_CAP_DELAY)) {
- av_free(s->decoded_frame);
- s->decoded_frame = NULL;
- } else {
-@@ -209,9 +224,9 @@ static void live_avcodec_encoder_main(struct encoder *
- }
- }
-
-- if (!final || s->codec->capabilities & (CODEC_CAP_DELAY | CODEC_CAP_VARIABLE_FRAME_SIZE | CODEC_CAP_SMALL_LAST_FRAME)) {
-+ if (!final || s->codec->capabilities & (AV_CODEC_CAP_DELAY | AV_CODEC_CAP_VARIABLE_FRAME_SIZE | AV_CODEC_CAP_SMALL_LAST_FRAME)) {
- // decode as much data is this encoder wants to
-- s->avpkt.size = FF_MIN_BUFFER_SIZE;
-+ s->avpkt.size = AV_INPUT_BUFFER_MIN_SIZE;
- if (avcodec_encode_audio2(c, &s->avpkt, s->decoded_frame, &got_packet) < 0) {
- fprintf(stderr, "avcodec_encoder_main: encoding failed\n");
- encoder->encoder_state = ES_STOPPING;
Index: head/audio/idjc/pkg-plist
===================================================================
--- head/audio/idjc/pkg-plist
+++ head/audio/idjc/pkg-plist
@@ -57,63 +57,86 @@
lib/idjc/site-packages/idjc/utils.py
lib/idjc/site-packages/idjc/utils.pyc
lib/idjc/site-packages/idjc/utils.pyo
-lib/python2.7/site-packages/idjcmonitor.py
-lib/python2.7/site-packages/idjcmonitor.pyc
-lib/python2.7/site-packages/idjcmonitor.pyo
+%%PYTHON_SITELIBDIR%%/idjcmonitor.py
+%%PYTHON_SITELIBDIR%%/idjcmonitor.pyc
+%%PYTHON_SITELIBDIR%%/idjcmonitor.pyo
+man/man1/idjc-auto.1.gz
+man/man1/idjc-ls.1.gz
+man/man1/idjc-new.1.gz
+man/man1/idjc-noauto.1.gz
+man/man1/idjc-rm.1.gz
+man/man1/idjc-run.1.gz
+man/man1/idjc.1.gz
share/appdata/idjc.appdata.xml
share/applications/idjc.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.gz
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.gz
%%PORTDOCS%%%%DOCSDIR%%/NEWS.gz
%%PORTDOCS%%%%DOCSDIR%%/README.gz
-%%DATADIR%%/add3.png
-%%DATADIR%%/advance.png
%%DATADIR%%/buildinfo
-%%DATADIR%%/classic_cross.png
-%%DATADIR%%/control_c.png
-%%DATADIR%%/control_k.png
-%%DATADIR%%/control_n.png
-%%DATADIR%%/control_p.png
-%%DATADIR%%/crossout.png
+%%DATADIR%%/darktheme/add3.png
+%%DATADIR%%/darktheme/advance.png
+%%DATADIR%%/darktheme/classic_cross.png
+%%DATADIR%%/darktheme/control_c.png
+%%DATADIR%%/darktheme/control_k.png
+%%DATADIR%%/darktheme/control_n.png
+%%DATADIR%%/darktheme/control_p.png
+%%DATADIR%%/darktheme/crossout.png
+%%DATADIR%%/darktheme/headroom.png
+%%DATADIR%%/darktheme/interlude2.png
+%%DATADIR%%/darktheme/listenerphones.png
+%%DATADIR%%/darktheme/mk2_cross.png
+%%DATADIR%%/darktheme/next.png
+%%DATADIR%%/darktheme/note.png
+%%DATADIR%%/darktheme/pass.png
+%%DATADIR%%/darktheme/pat3.png
+%%DATADIR%%/darktheme/pause.png
+%%DATADIR%%/darktheme/play2.png
+%%DATADIR%%/darktheme/prev.png
+%%DATADIR%%/darktheme/repeat.png
+%%DATADIR%%/darktheme/speedicon.png
+%%DATADIR%%/darktheme/stop.png
+%%DATADIR%%/darktheme/volume2.png
%%DATADIR%%/greenphone.png
-%%DATADIR%%/headroom.png
%%DATADIR%%/icon.png
-%%DATADIR%%/interlude2.png
%%DATADIR%%/jack2.png
%%DATADIR%%/led_lit_amber_black_border_64x64.png
%%DATADIR%%/led_lit_green_black_border_64x64.png
%%DATADIR%%/led_lit_red_black_border_64x64.png
%%DATADIR%%/led_unlit_clear_border_64x64.png
-%%DATADIR%%/listenerphones.png
+%%DATADIR%%/lighttheme/add3.png
+%%DATADIR%%/lighttheme/advance.png
+%%DATADIR%%/lighttheme/classic_cross.png
+%%DATADIR%%/lighttheme/control_c.png
+%%DATADIR%%/lighttheme/control_k.png
+%%DATADIR%%/lighttheme/control_n.png
+%%DATADIR%%/lighttheme/control_p.png
+%%DATADIR%%/lighttheme/crossout.png
+%%DATADIR%%/lighttheme/headroom.png
+%%DATADIR%%/lighttheme/interlude2.png
+%%DATADIR%%/lighttheme/listenerphones.png
+%%DATADIR%%/lighttheme/mk2_cross.png
+%%DATADIR%%/lighttheme/next.png
+%%DATADIR%%/lighttheme/note.png
+%%DATADIR%%/lighttheme/pass.png
+%%DATADIR%%/lighttheme/pat3.png
+%%DATADIR%%/lighttheme/pause.png
+%%DATADIR%%/lighttheme/play2.png
+%%DATADIR%%/lighttheme/prev.png
+%%DATADIR%%/lighttheme/repeat.png
+%%DATADIR%%/lighttheme/speedicon.png
+%%DATADIR%%/lighttheme/stop.png
+%%DATADIR%%/lighttheme/volume2.png
%%DATADIR%%/logo.png
%%DATADIR%%/mic4.png
%%DATADIR%%/mic_off.png
%%DATADIR%%/mic_on.png
%%DATADIR%%/mic_unshown.png
-%%DATADIR%%/mk2_cross.png
-%%DATADIR%%/next.png
-%%DATADIR%%/note.png
-%%DATADIR%%/pass.png
-%%DATADIR%%/pat3.png
-%%DATADIR%%/pause.png
%%DATADIR%%/pbphone.png
-%%DATADIR%%/play2.png
%%DATADIR%%/play3.png
-%%DATADIR%%/prev.png
%%DATADIR%%/rec.png
%%DATADIR%%/redphone.png
-%%DATADIR%%/repeat.png
-%%DATADIR%%/speedicon.png
-%%DATADIR%%/stop.png
-%%DATADIR%%/volume2.png
-%%NLS%%share/locale/fr/LC_MESSAGES/idjc.mo
-%%NLS%%share/locale/es/LC_MESSAGES/idjc.mo
-%%NLS%%share/locale/it/LC_MESSAGES/idjc.mo
-man/man1/idjc-auto.1.gz
-man/man1/idjc-ls.1.gz
-man/man1/idjc-new.1.gz
-man/man1/idjc-noauto.1.gz
-man/man1/idjc-rm.1.gz
-man/man1/idjc-run.1.gz
-man/man1/idjc.1.gz
+share/locale/es/LC_MESSAGES/idjc.mo
+share/locale/fr/LC_MESSAGES/idjc.mo
+share/locale/it/LC_MESSAGES/idjc.mo
share/pixmaps/idjc.png
Index: head/audio/shout-idjc/Makefile
===================================================================
--- head/audio/shout-idjc/Makefile
+++ head/audio/shout-idjc/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= libshout-idjc
-PORTVERSION= 2.4.1
-PORTREVISION= 3
+PORTVERSION= 2.4.2
CATEGORIES= audio python
-MASTER_SITES= SF/idjc/libshout-idjc/
+MASTER_SITES= SF/libshoutidjc.idjc.p
MAINTAINER= sbruno@FreeBSD.org
COMMENT= Shoutcast/Icecast Library for audio/idjc
@@ -29,5 +28,11 @@
post-patch:
@${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/configure
@${REINPLACE_CMD} '/^doc_DATA =/ s|COPYING||' ${WRKSRC}/Makefile.am
+ @${MV} ${WRKSRC}/m4/shout.m4 ${WRKSRC}/m4/shout-idjc.m4
+ @${REINPLACE_CMD} '/^EXTRA_DIST =/ s|shout.m4|shout-idjc.m4|' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} '/^m4data_DATA =/ s|shout.m4|shout-idjc.m4|' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} '/^ckportdir = .*/d' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} '/^ckport_DATA = .*/d' ${WRKSRC}/Makefile.am
+
.include <bsd.port.mk>
Index: head/audio/shout-idjc/distinfo
===================================================================
--- head/audio/shout-idjc/distinfo
+++ head/audio/shout-idjc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488521656
-SHA256 (libshout-idjc-2.4.1.tar.gz) = 50aa0ea9a8f26dab7d3e9c9bc4ee7f009107c4ecf386f418cb3b1c9931787596
-SIZE (libshout-idjc-2.4.1.tar.gz) = 509061
+TIMESTAMP = 1527129180
+SHA256 (libshout-idjc-2.4.2.tar.gz) = b072acab07d542849e6b9edb7d5b094b83c327ea14e5e7e55bd74ebb61246e77
+SIZE (libshout-idjc-2.4.2.tar.gz) = 538895
Index: head/audio/shout-idjc/pkg-plist
===================================================================
--- head/audio/shout-idjc/pkg-plist
+++ head/audio/shout-idjc/pkg-plist
@@ -4,6 +4,8 @@
lib/libshout-idjc.so.3
lib/libshout-idjc.so.3.2.0
libdata/pkgconfig/shout-idjc.pc
-share/aclocal/shout.m4
+share/aclocal/shout-idjc.m4
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/example.c
+%%PORTDOCS%%%%DOCSDIR%%/nonblocking.c

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 10:02 PM (17 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27411168
Default Alt Text
D15555.id43071.diff (10 KB)

Event Timeline