diff options
| author | William Grzybowski <wg@FreeBSD.org> | 2013-11-02 20:20:53 +0000 |
|---|---|---|
| committer | William Grzybowski <wg@FreeBSD.org> | 2013-11-02 20:20:53 +0000 |
| commit | 6b05da6143a239c515b53e945fa5dfa35ecb2371 (patch) | |
| tree | ff49d375f5872aca91131dd3040cbc12421fd554 /multimedia/vlc | |
| parent | c906e171d95040fe50a5dca58c48b33429c93ff3 (diff) | |
| download | ports-6b05da6143a239c515b53e945fa5dfa35ecb2371.tar.gz ports-6b05da6143a239c515b53e945fa5dfa35ecb2371.zip | |
Notes
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 14 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-oss | 21 |
2 files changed, 27 insertions, 8 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 0bc6929a0130..dd3e72213019 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -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 DBUS DIRAC DOCS DTS DVDREAD \ 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 \ diff --git a/multimedia/vlc/files/patch-oss b/multimedia/vlc/files/patch-oss new file mode 100644 index 000000000000..3ba21f58d409 --- /dev/null +++ b/multimedia/vlc/files/patch-oss @@ -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; |