From owner-svn-ports-head@FreeBSD.ORG Wed Aug 7 06:35:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 95FFF64E; Wed, 7 Aug 2013 06:35:26 +0000 (UTC) (envelope-from oliver@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 682DA2A41; Wed, 7 Aug 2013 06:35:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r776ZQhj061137; Wed, 7 Aug 2013 06:35:26 GMT (envelope-from oliver@svn.freebsd.org) Received: (from oliver@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r776ZPt5061130; Wed, 7 Aug 2013 06:35:25 GMT (envelope-from oliver@svn.freebsd.org) Message-Id: <201308070635.r776ZPt5061130@svn.freebsd.org> From: Oliver Lehmann Date: Wed, 7 Aug 2013 06:35:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324331 - in head/multimedia: audacious audacious-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 06:35:26 -0000 Author: oliver Date: Wed Aug 7 06:35:24 2013 New Revision: 324331 URL: http://svnweb.freebsd.org/changeset/ports/324331 Log: update audacious + audacious-plugins to 3.4 Modified: head/multimedia/audacious-plugins/Makefile head/multimedia/audacious-plugins/distinfo head/multimedia/audacious-plugins/pkg-plist head/multimedia/audacious/Makefile head/multimedia/audacious/distinfo head/multimedia/audacious/pkg-plist Modified: head/multimedia/audacious-plugins/Makefile ============================================================================== --- head/multimedia/audacious-plugins/Makefile Wed Aug 7 06:31:46 2013 (r324330) +++ head/multimedia/audacious-plugins/Makefile Wed Aug 7 06:35:24 2013 (r324331) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= audacious-plugins -PORTVERSION= 3.3.4 -PORTREVISION= 3 +PORTVERSION= 3.4 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -18,7 +17,7 @@ USE_BZIP2= yes USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS= --disable-pulse --disable-mpris2 +CONFIGURE_ARGS= --disable-mpris2 WANT_GNOME= yes WANT_EFL= yes WANT_SDL= yes @@ -26,11 +25,11 @@ WANT_SDL= yes PORTDOCS= AUTHORS OPTIONS_DEFINE= DBUS OSS4 SDLOUT ALSA CUE MP3 STATUSICON AOSD AOSDXCOMP \ - ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK SID \ - CDAUDIO SCROBBLER MMS GIO MTP NLS RESAMPLE AMIDI \ - NOTIFY BS2B FFAUDIO PULSE NEON -OPTIONS_DEFAULT= DBUS CUE MP3 STATUSICON AOSD AOSDXCOMP AAC CDAUDIO \ - SCROBBLER NEON NLS OSS4 + ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK \ + CDAUDIO SCROBBLER MMS GIO NLS RESAMPLE AMIDI GLSPECTRUM \ + NOTIFY BS2B FFAUDIO PULSE NEON SPEEDPITCH LIRC MP3FILEWRITER +OPTIONS_DEFAULT=DBUS CUE MP3 STATUSICON AOSD AOSDXCOMP AAC CDAUDIO \ + SCROBBLER NEON NLS OSS4 FFAUDIO ADPLUG_DESC= ADPLUG decoder AMIDI_DESC= Amidi decoder @@ -39,15 +38,18 @@ AOSDXCOMP_DESC= Audacious OSD X Composit BS2B_DESC= BS2B effect CDAUDIO_DESC= CD audio input FFAUDIO_DESC= FFAudio decoder +GLSPECTRUM_DESC=OpenGL Spectrum Analyzer GIO_DESC= GIO support OSS4_DESC= Open Sound System 4 PULSE_DESC= PulseAudio support RESAMPLE_DESC= Resample effect SCROBBLER_DESC= Scrobbler decoder SDLOUT_DESC= SDL Output -SID_DESC= Commodore64 -STATUSICON_DESC= X11 Status icon +STATUSICON_DESC=X11 Status icon NEON_DESC= Neon plugin +SPEEDPITCH_DESC=Speed and Pitch plugin +LIRC_DESC= LIRC plugin +MP3FILEWRITER= Filewriter plugin for MP3 .include @@ -63,12 +65,21 @@ CONFIGURE_ARGS+=--disable-sdlout .if ${PORT_OPTIONS:MNOTIFY} || exists(${LOCALBASE}/lib/libnotify.so.1) LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-notify -PLIST_SUB+= NOTIFY="" +PLIST_SUB+= NOTIFY="" .else PLIST_SUB+= NOTIFY="@comment " CONFIGURE_ARGS+=--disable-notify .endif +.if ${PORT_OPTIONS:MGLSPECTRUM} +USE_GL= gl +CONFIGURE_ARGS+=--enable-glspectrum +PLIST_SUB+= GLSPECTRUM="" +.else +CONFIGURE_ARGS+=--disable-glspectrum +PLIST_SUB+= GLSPECTRUM="@comment " +.endif + .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= dbus-glib:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS+=--enable-gnomeshortcuts @@ -89,10 +100,16 @@ PLIST_SUB+= CUEPLUGIN="@comment " .if ${PORT_OPTIONS:MMP3} LIB_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 -CONFIGURE_ARGS+=--enable-mp3 +CONFIGURE_ARGS+=--enable-mp3 --enable-filewriter_mp3 PLIST_SUB+= MP3PLUGIN="" +.if ${PORT_OPTIONS:MMP3FILEWRITER} +LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame +CONFIGURE_ARGS+=--enable-filewriter_mp3 +.else +CONFIGURE_ARGS+=--disable-filewriter_mp3 +.endif .else -CONFIGURE_ARGS+=--disable-mp3 +CONFIGURE_ARGS+=--disable-mp3 --disable-filewriter_mp3 PLIST_SUB+= MP3PLUGIN="@comment " .endif @@ -151,7 +168,7 @@ PLIST_SUB+= FLACPLUGIN="@comment " .endif .if ${PORT_OPTIONS:MFFAUDIO} -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg1 +LIB_DEPENDS+= avcodec-devel:${PORTSDIR}/multimedia/ffmpeg-devel CONFIGURE_ARGS+=--enable-ffaudio PLIST_SUB+= FFAUDIOPLUGIN="" .else @@ -208,10 +225,10 @@ PLIST_SUB+= JACKPLUGIN="@comment " .if ${PORT_OPTIONS:MSCROBBLER} LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl PLIST_SUB+= SCROBBLERPLUGIN="" -CONFIGURE_ARGS+=--enable-scrobbler +CONFIGURE_ARGS+=--enable-scrobbler2 .else PLIST_SUB+= SCROBBLERPLUGIN="@comment " -CONFIGURE_ARGS+=--disable-scrobbler +CONFIGURE_ARGS+=--disable-scrobbler2 .endif .if ${PORT_OPTIONS:MOSS4} @@ -259,22 +276,22 @@ CONFIGURE_ARGS+=--disable-mms PLIST_SUB+= MMSPLUGIN="@comment " .endif -.if ${PORT_OPTIONS:MMTP} -LIB_DEPENDS+= mtp:${PORTSDIR}/audio/libmtp -CONFIGURE_ARGS+=--enable-mtp_up -PLIST_SUB+= MTPPLUGIN="" -.else -CONFIGURE_ARGS+=--disable-mtp_up -PLIST_SUB+= MTPPLUGIN="@comment " -.endif - .if ${PORT_OPTIONS:MRESAMPLE} LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate CONFIGURE_ARGS+=--enable-resample -PLIST_SUB+= RESAMPLEPLUGIN="" +PLIST_SUB+= RESAMPLEPLUGIN="" .else CONFIGURE_ARGS+=--disable-resample -PLIST_SUB+= RESAMPLEPLUGIN="@comment " +PLIST_SUB+= RESAMPLEPLUGIN="@comment " +.endif + +.if ${PORT_OPTIONS:MSPEEDPITCH} +LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate +CONFIGURE_ARGS+=--enable-speedpitch +PLIST_SUB+= SPEEDPITCHPLUGIN="" +.else +CONFIGURE_ARGS+=--disable-speedpitch +PLIST_SUB+= SPEEDPITCHPLUGIN="@comment " .endif .if ${PORT_OPTIONS:MALSA} @@ -341,6 +358,15 @@ CONFIGURE_ARGS+=--disable-pulse PLIST_SUB+= PULSE="@comment " .endif +.if ${PORT_OPTIONS:MLIRC) +LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc +CONFIGURE_ARGS+=--enable-lirc +PLIST_SUB+= LIRC="" +.else +CONFIGURE_ARGS+=--disable-lirc +PLIST_SUB+= LIRC="@comment " +.endif + pre-everything:: .if ${PORT_OPTIONS:MAUDIOCD} && !exists(${LOCALBASE}/lib/libcdio_cdda.so) @${ECHO_CMD} "" @@ -348,6 +374,14 @@ pre-everything:: @${ECHO_CMD} "" .endif +post-patch: +.if ${PORT_OPTIONS:MFFAUDIO} + @${REINPLACE_CMD} -e 's|libavcodec |libavcodec-devel | ; \ + s|libavformat |libavformat-devel | ; \ + s|libavutil |libavutil-devel |' \ + ${WRKSRC}/configure ${WRKSRC}/configure.ac +.endif + pre-configure: .if ${PORT_OPTIONS:MAUDIOCD} && !exists(${LOCALBASE}/lib/libcdio_cdda.so) @${ECHO_CMD} "" Modified: head/multimedia/audacious-plugins/distinfo ============================================================================== --- head/multimedia/audacious-plugins/distinfo Wed Aug 7 06:31:46 2013 (r324330) +++ head/multimedia/audacious-plugins/distinfo Wed Aug 7 06:35:24 2013 (r324331) @@ -1,2 +1,2 @@ -SHA256 (audacious-plugins-3.3.4.tar.bz2) = b66dd84ab092d9fb64182599706ed60a3c382c904a77e23285e1e271f007afd0 -SIZE (audacious-plugins-3.3.4.tar.bz2) = 1756149 +SHA256 (audacious-plugins-3.4.tar.bz2) = 8b10c61481d7ee9972f329d79f56001aa7b092aab44a0084bdd1472fe529b874 +SIZE (audacious-plugins-3.4.tar.bz2) = 1745424 Modified: head/multimedia/audacious-plugins/pkg-plist ============================================================================== --- head/multimedia/audacious-plugins/pkg-plist Wed Aug 7 06:31:46 2013 (r324330) +++ head/multimedia/audacious-plugins/pkg-plist Wed Aug 7 06:35:24 2013 (r324331) @@ -130,12 +130,13 @@ share/audacious/ui/playlist.ui %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/et/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/eu/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/fi/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacious-plugins.mo -%%NLS%%share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/it/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/ja/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/ko/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/ky/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/lt/LC_MESSAGES/audacious-plugins.mo @@ -144,8 +145,10 @@ share/audacious/ui/playlist.ui %%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/ru/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/si/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/ta/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo @@ -162,11 +165,11 @@ lib/audacious/Transport/unix-io.so lib/audacious/Input/tonegen.so lib/audacious/Input/vtx.so %%FLACPLUGIN%%lib/audacious/Input/flacng.so +%%FFAUDIOPLUGIN%%lib/audacious/Input/ffaudio.so lib/audacious/Input/xsf.so %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so lib/audacious/Input/metronom.so %%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so -%%SIDPLUGIN%%lib/audacious/Input/sid.so lib/audacious/Input/console.so lib/audacious/Input/psf2.so %%MP3PLUGIN%%lib/audacious/Input/madplug.so @@ -175,7 +178,7 @@ lib/audacious/Input/psf2.so lib/audacious/Effect/stereo.so lib/audacious/Effect/crystalizer.so %%RESAMPLEPLUGIN%%lib/audacious/Effect/resample.so -%%RESAMPLEPLUGIN%%lib/audacious/Effect/speed-pitch.so +%%SPEEDPITCHPLUGIN%%lib/audacious/Effect/speed-pitch.so lib/audacious/Effect/crossfade.so lib/audacious/Effect/compressor.so lib/audacious/Effect/ladspa.so @@ -185,8 +188,8 @@ lib/audacious/Effect/voice_removal.so %%BS2BPLUGIN%%lib/audacious/Effect/bs2b.so lib/audacious/Visualization/blur_scope.so lib/audacious/Visualization/cairo-spectrum.so -%%MTPPLUGIN%%lib/audacious/General/mtp_up.so %%DBUS%%lib/audacious/General/gnomeshortcuts.so +%%GLSPECTRUM%%lib/audacious/Visualization/gl-spectrum.so lib/audacious/General/lyricwiki.so %%SCROBBLERPLUGIN%%lib/audacious/General/scrobbler.so lib/audacious/General/alarm.so @@ -204,6 +207,7 @@ lib/audacious/General/song_change.so %%ALSAPLUGIN%%lib/audacious/Output/alsa.so lib/audacious/Output/filewriter.so %%JACKPLUGIN%%lib/audacious/Output/jackout.so +%%PULSE%%lib/audacious/Output/pulse_audio.so %%SDL%%lib/audacious/Output/sdlout.so lib/audacious/Container/xspf.so lib/audacious/Container/audpl.so @@ -233,9 +237,10 @@ lib/audacious/Container/pls.so %%NLS%%@dirrmtry share/locale/id_ID %%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ky +%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/si %%NLS%%@dirrmtry share/locale/sr_RS/LC_MESSAGES %%NLS%%@dirrmtry share/locale/sr_RS %%NLS%%@dirrmtry share/locale/es_AR/LC_MESSAGES %%NLS%%@dirrmtry share/locale/es_AR -@dirrm %%DOCSDIR%% @dirrmtry share/audacious Modified: head/multimedia/audacious/Makefile ============================================================================== --- head/multimedia/audacious/Makefile Wed Aug 7 06:31:46 2013 (r324330) +++ head/multimedia/audacious/Makefile Wed Aug 7 06:35:24 2013 (r324331) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.3.4 +PORTVERSION= 3.4 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -22,7 +22,7 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --disable-chardet +CONFIGURE_ARGS= --disable-chardet --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig MAN1= audacious.1 audtool.1 Modified: head/multimedia/audacious/distinfo ============================================================================== --- head/multimedia/audacious/distinfo Wed Aug 7 06:31:46 2013 (r324330) +++ head/multimedia/audacious/distinfo Wed Aug 7 06:35:24 2013 (r324331) @@ -1,2 +1,2 @@ -SHA256 (audacious-3.3.4.tar.bz2) = 671cdbf9b6b722b4ff4f43bcf85da0bdd1dfdf461b510cf6ecdb9187a427fca7 -SIZE (audacious-3.3.4.tar.bz2) = 473345 +SHA256 (audacious-3.4.tar.bz2) = a401b4ce85fda23bcb17c187f006ee00e8af2e5e4000768dee08b8108ed975c2 +SIZE (audacious-3.4.tar.bz2) = 469049 Modified: head/multimedia/audacious/pkg-plist ============================================================================== --- head/multimedia/audacious/pkg-plist Wed Aug 7 06:31:46 2013 (r324330) +++ head/multimedia/audacious/pkg-plist Wed Aug 7 06:35:24 2013 (r324331) @@ -64,11 +64,13 @@ share/applications/audacious.desktop share/icons/hicolor/48x48/apps/audacious.png share/icons/hicolor/scalable/apps/audacious.svg %%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo +%%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo %%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo %%NLS%%share/locale/el/LC_MESSAGES/audacious.mo +%%NLS%%share/locale/eo/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo @@ -78,7 +80,6 @@ share/icons/hicolor/scalable/apps/audaci %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo %%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo @@ -87,15 +88,19 @@ share/icons/hicolor/scalable/apps/audaci %%NLS%%share/locale/ky/LC_MESSAGES/audacious.mo %%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo %%NLS%%share/locale/lv/LC_MESSAGES/audacious.mo +%%NLS%%share/locale/ms/LC_MESSAGES/audacious.mo %%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo %%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo +%%NLS%%share/locale/si/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo +%%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo +%%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo %%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo @@ -111,7 +116,6 @@ share/icons/hicolor/scalable/apps/audaci %%NLS%%@dirrmtry share/locale/es_AR %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ast -@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/images @dirrm %%DATADIR%% @dirrmtry share/applications