Date: Sat, 2 Nov 2013 20:20:53 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332541 - in head/multimedia/vlc: . files Message-ID: <201311022020.rA2KKrng030413@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Nov 2 20:20:53 2013 New Revision: 332541 URL: http://svnweb.freebsd.org/changeset/ports/332541 Log: multimedia/vlc: enable OSS - Enable OSS again (thanks to Rémi Denis-Courmont) - Add PULSEAUDIO back as an option Added: head/multimedia/vlc/files/patch-oss (contents, props changed) Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Sat Nov 2 20:17:28 2013 (r332540) +++ head/multimedia/vlc/Makefile Sat Nov 2 20:20:53 2013 (r332541) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -17,8 +17,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libproxy.so:${PORTSDIR}/net/libproxy \ - libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \ - libpulse.so:${PORTSDIR}/audio/pulseaudio + libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg @@ -26,7 +25,7 @@ OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DVDNAV FAAD FLAC FLUID FRIBIDI GNOMEVFS GNUTLS GOOM \ HTTPD JACK LIBSSH2 LIRC LIVEMEDIA LUA MAD MATROSKA MODPLUG \ MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OPTIMIZED_CFLAGS OGG \ - OPUS PNG QT4 REALAUDIO RUNROOT \ + OPUS PNG PULSEAUDIO QT4 REALAUDIO RUNROOT \ SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SVG \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \ X11 X264 ZVBI SERVER_ONLY DEBUG \ @@ -182,8 +181,8 @@ OPUS_CONFIGURE_ENABLE= opus PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png -#PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio -#PULSEAUDIO_CONFIGURE_ENABLE= pulse +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= pulse REALAUDIO_CONFIGURE_ENABLE= realrtsp @@ -258,14 +257,13 @@ LDFLAGS+= ${PTHREAD_LIBS} -lc CONFIGURE_ARGS+= --enable-vlc \ --enable-avcodec \ --enable-avformat \ + --enable-oss \ --enable-postproc \ - --enable-pulse \ --enable-sftp \ --enable-libgcrypt \ --disable-alsa \ --disable-dc1394 \ --disable-directfb \ - --disable-oss \ --disable-projectm \ --disable-telx \ --disable-tremor \ Added: head/multimedia/vlc/files/patch-oss ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-oss Sat Nov 2 20:20:53 2013 (r332541) @@ -0,0 +1,21 @@ +From 0697e180135c34ce2d3aba3684a0970a0420aa70 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sat, 2 Nov 2013 21:58:48 +0200 +Subject: [PATCH] oss: fix corrupt audio format (fixes #9760) + +--- + modules/audio_output/oss.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git modules/audio_output/oss.c modules/audio_output/oss.c +index 8dc4a4a..69c6b60 100644 +--- modules/audio_output/oss.c ++++ modules/audio_output/oss.c +@@ -208,6 +208,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) + fmt->i_original_channels = + fmt->i_physical_channels = channels; + } ++ aout_FormatPrepare (fmt); + + VolumeSync (aout); + sys->starting = true;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311022020.rA2KKrng030413>