Index: branches/2017Q1/multimedia/audacious-plugins/Makefile =================================================================== --- branches/2017Q1/multimedia/audacious-plugins/Makefile (revision 432942) +++ branches/2017Q1/multimedia/audacious-plugins/Makefile (revision 432943) @@ -1,128 +1,128 @@ # Created by: Zastupov Stepan [RedChrom] # $FreeBSD$ PORTNAME= audacious-plugins PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ MAINTAINER= olivierd@FreeBSD.org COMMENT= Plugins needed for audacious LICENSE= GPLv3 BUILD_DEPENDS= audacious:multimedia/audacious LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 RUN_DEPENDS= audacious:multimedia/audacious CONFLICTS_INSTALL= audacious-plugins-gtk3-3.* GNU_CONFIGURE= yes USES= compiler:c++11-lib execinfo gettext-tools gmake iconv \ localbase pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GNOME= gtk20 glib20 libxml2 cairo gdkpixbuf2 USE_XORG= x11 CONFIGURE_ARGS+=--disable-console --disable-sndio --disable-soxr \ --enable-gnomeshortcuts \ --enable-gtk --enable-filewriter --enable-hotkey OPTIONS_DEFINE= AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \ FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \ OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \ SPEEDPITCH VORBIS WAVPACK OPTIONS_DEFAULT= AAC AOSD CDDA CUE FFMPEG FLAC MP3 \ MMS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK AAC_LIB_DEPENDS= libfaad.so:audio/faad AAC_CONFIGURE_OFF= --disable-aac ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --disable-alsa AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth AMIDI_CONFIGURE_OFF= --disable-amidiplug AOSD_USE= gnome=pango AOSD_USE= xorg=xrender AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite AOSD_CONFIGURE_ENABLE= aosd BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b BS2B_CONFIGURE_OFF= --disable-bs2b CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ libcddb.so:audio/libcddb \ libcdio.so:sysutils/libcdio CDDA_CONFIGURE_OFF= --disable-cdaudio CUE_LIB_DEPENDS= libcue.so:textproc/libcue CUE_CONFIGURE_OFF= --disable-cue FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_ON= --enable-flac --enable-filewriter FLAC_CONFIGURE_OFF= --disable-flac --disable-filewriter JACK_LIB_DEPENDS= libjack.so:audio/jack \ libsamplerate.so:audio/libsamplerate JACK_CONFIGURE_OFF= --disable-jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_OFF= --disable-filewriter_mp3 LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_OFF= --disable-lirc MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 MP3_CONFIGURE_OFF= --disable-mp3 MMS_LIB_DEPENDS= libmms.so:net/libmms MMS_CONFIGURE_OFF= --disable-mms MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_OFF= --disable-modplug MPRIS_CONFIGURE_ENABLE= mpris2 NEON_LIB_DEPENDS= libneon.so:www/neon NEON_CONFIGURE_OFF= --disable-neon NLS_USES= gettext-runtime NLS_CONFIGURE_OFF= --disable-nls NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE= notify OPENGL_USE= xorg=x11 gl=gl OPENGL_CONFIGURE_ENABLE= glspectrum OSS_CONFIGURE_ENABLE= oss4 PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF= --disable-pulse SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_OFF= --disable-resample SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl SCROBBLER_CONFIGURE_OFF= --disable-scrobbler2 SDL_LIB_DEPENDS= libSDL2.so:devel/sdl20 SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2 SDL_CONFIGURE_OFF= --disable-sdlout SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp SID_CONFIGURE_OFF= --disable-sid SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile SNDFILE_CONFIGURE_OFF= --disable-sndfile SPEEDPITCH_CONFIGURE_OFF= --disable-speedpitch SPEEDPITCH_IMPLIES= SAMPLERATE VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_CONFIGURE_ENABLE= vorbis WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_OFF= --disable-wavpack OPTIONS_SUB= yes AMIDI_DESC= Amidi decoder AOSD_DESC= Audacious OSD BS2B_DESC= BS2B effect SCROBBLER_DESC= Scrobbler decoder SID_DESC= Sound chip emulator of Commodore NEON_DESC= Neon plugin SPEEDPITCH_DESC=Speed and Pitch plugin MPRIS_DESC= NPRIS plugin post-patch: ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ ${WRKSRC}/buildsys.mk.in post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \ -exec ${STRIP_CMD} {} \; .include Index: branches/2017Q1/multimedia/audacious-plugins/files/patch-src_ffaudio_ffaudio-core.cc =================================================================== --- branches/2017Q1/multimedia/audacious-plugins/files/patch-src_ffaudio_ffaudio-core.cc (nonexistent) +++ branches/2017Q1/multimedia/audacious-plugins/files/patch-src_ffaudio_ffaudio-core.cc (revision 432943) @@ -0,0 +1,24 @@ +--- src/ffaudio/ffaudio-core.cc.orig 2016-12-06 14:15:33 UTC ++++ src/ffaudio/ffaudio-core.cc +@@ -99,7 +99,8 @@ struct ScopedContext + + struct ScopedPacket : public AVPacket + { +- ScopedPacket () { av_init_packet (this); } ++ ScopedPacket () : AVPacket () ++ { av_init_packet (this); } + + #if CHECK_LIBAVCODEC_VERSION (55, 25, 100, 55, 16, 0) + ~ScopedPacket () { av_packet_unref (this); } +@@ -553,8 +554,10 @@ bool FFaudio::play (const char * filenam + /* On EOF, send an empty packet to "flush" the decoder */ + /* Otherwise, make a mutable (shallow) copy of the real packet */ + AVPacket tmp; +- if (eof) ++ if (eof) { ++ tmp = AVPacket (); + av_init_packet (& tmp); ++ } + else + tmp = pkt; + Property changes on: branches/2017Q1/multimedia/audacious-plugins/files/patch-src_ffaudio_ffaudio-core.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q1/multimedia/audacious-plugins-gtk3/Makefile =================================================================== --- branches/2017Q1/multimedia/audacious-plugins-gtk3/Makefile (revision 432942) +++ branches/2017Q1/multimedia/audacious-plugins-gtk3/Makefile (revision 432943) @@ -1,133 +1,134 @@ # Created by: Zastupov Stepan [RedChrom] # $FreeBSD$ PORTNAME= audacious-plugins PORTVERSION= 3.8.1 DISTVERSIONSUFFIX= -gtk3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ PKGNAMESUFFIX= ${DISTVERSIONSUFFIX} MAINTAINER= olivierd@FreeBSD.org COMMENT= Plugins needed for audacious-gtk3 LICENSE= GPLv3 BUILD_DEPENDS= audacious:multimedia/audacious-gtk3 LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 RUN_DEPENDS= audacious:multimedia/audacious-gtk3 CONFLICTS_INSTALL= audacious-plugins-3.* MASTERDIR= ${.CURDIR}/../audacious-plugins DISTINFO_FILE= ${.CURDIR}/distinfo +FILESDIR= ${MASTERDIR}/files GNU_CONFIGURE= yes USES= compiler:c++11-lib execinfo gettext-tools gmake iconv \ localbase pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GNOME= gtk30 glib20 libxml2 cairo gdkpixbuf2 USE_XORG= x11 CONFIGURE_ARGS+=--disable-console --disable-sndio --disable-soxr \ --enable-gnomeshortcuts \ --enable-gtk --enable-filewriter --enable-hotkey OPTIONS_DEFINE= AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \ FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \ OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \ SPEEDPITCH VORBIS WAVPACK OPTIONS_DEFAULT= AAC AOSD CDDA CUE FFMPEG FLAC MP3 \ MMS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK AAC_LIB_DEPENDS= libfaad.so:audio/faad AAC_CONFIGURE_OFF= --disable-aac ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --disable-alsa AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth AMIDI_CONFIGURE_OFF= --disable-amidiplug AOSD_USE= gnome=pango AOSD_USE= xorg=xrender AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite AOSD_CONFIGURE_ENABLE= aosd BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b BS2B_CONFIGURE_OFF= --disable-bs2b CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ libcddb.so:audio/libcddb \ libcdio.so:sysutils/libcdio CDDA_CONFIGURE_OFF= --disable-cdaudio CUE_LIB_DEPENDS= libcue.so:textproc/libcue CUE_CONFIGURE_OFF= --disable-cue FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_ON= --enable-flac --enable-filewriter FLAC_CONFIGURE_OFF= --disable-flac --disable-filewriter JACK_LIB_DEPENDS= libjack.so:audio/jack \ libsamplerate.so:audio/libsamplerate JACK_CONFIGURE_OFF= --disable-jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_OFF= --disable-filewriter_mp3 LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_OFF= --disable-lirc MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 MP3_CONFIGURE_OFF= --disable-mp3 MMS_LIB_DEPENDS= libmms.so:net/libmms MMS_CONFIGURE_OFF= --disable-mms MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_OFF= --disable-modplug MPRIS_CONFIGURE_ENABLE= mpris2 NEON_LIB_DEPENDS= libneon.so:www/neon NEON_CONFIGURE_OFF= --disable-neon NLS_USES= gettext-runtime NLS_CONFIGURE_OFF= --disable-nls NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE= notify OPENGL_USE= xorg=x11 gl=gl OPENGL_CONFIGURE_ENABLE= glspectrum OSS_CONFIGURE_ENABLE= oss4 PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF= --disable-pulse SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_OFF= --disable-resample SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl SCROBBLER_CONFIGURE_OFF= --disable-scrobbler2 SDL_LIB_DEPENDS= libSDL2.so:devel/sdl20 SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2 SDL_CONFIGURE_OFF= --disable-sdlout SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp SID_CONFIGURE_OFF= --disable-sid SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile SNDFILE_CONFIGURE_OFF= --disable-sndfile SPEEDPITCH_CONFIGURE_OFF= --disable-speedpitch SPEEDPITCH_IMPLIES= SAMPLERATE VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_CONFIGURE_ENABLE= vorbis WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_OFF= --disable-wavpack OPTIONS_SUB= yes AMIDI_DESC= Amidi decoder AOSD_DESC= Audacious OSD BS2B_DESC= BS2B effect SCROBBLER_DESC= Scrobbler decoder SID_DESC= Sound chip emulator of Commodore NEON_DESC= Neon plugin SPEEDPITCH_DESC=Speed and Pitch plugin MPRIS_DESC= NPRIS plugin post-patch: ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ ${WRKSRC}/buildsys.mk.in post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \ -exec ${STRIP_CMD} {} \; .include Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 432942) +++ branches/2017Q1 (revision 432943) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r432652