summaryrefslogtreecommitdiff
path: root/extra/vlc
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-09 10:55:19 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-09 10:55:19 -0300
commit149750d28420a7b59fab5501ab9aaca095f6fa46 (patch)
treeb263a29e10663635bb00dff7dde4c7c7ac8f30d7 /extra/vlc
parent1c0a9e2b2298f550629181080e63053fcb440743 (diff)
parent7a3611f5caa5e34c1f2b582640f97b733110ae63 (diff)
Lots of removed PKGBUILDs, kept mplayer2
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el Conflicts: community-testing/vdrift/PKGBUILD community/acpitool/PKGBUILD community/amaya/PKGBUILD community/apparix/PKGBUILD community/avant-window-navigator/PKGBUILD community/awn-extras-applets/PKGBUILD community/bmpanel/PKGBUILD community/clipgrab/PKGBUILD community/compizconfig-backend-kconfig4/PKGBUILD community/conkeror-git/PKGBUILD community/cross-arm-elf-binutils/PKGBUILD community/cross-arm-elf-gcc-base/PKGBUILD community/cross-arm-wince-cegcc-binutils/PKGBUILD community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD community/cross-arm-wince-cegcc-cegccdll/PKGBUILD community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD community/cross-arm-wince-cegcc-gcc-base/PKGBUILD community/cross-arm-wince-cegcc-gcc/PKGBUILD community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD community/cross-arm-wince-cegcc-newlib/PKGBUILD community/cross-arm-wince-cegcc-profile/PKGBUILD community/cross-arm-wince-cegcc-w32api/PKGBUILD community/dar/PKGBUILD community/driftnet/PKGBUILD community/duff/PKGBUILD community/dvdstyler/PKGBUILD community/eiciel/PKGBUILD community/emesene/PKGBUILD community/eterm/PKGBUILD community/extrema/PKGBUILD community/fail2ban/PKGBUILD community/fgetty/PKGBUILD community/fio/PKGBUILD community/flvstreamer/PKGBUILD community/fotoxx/PKGBUILD community/ghdl/PKGBUILD community/gnofract4d/PKGBUILD community/gnome-do/PKGBUILD community/grass/PKGBUILD community/gri/PKGBUILD community/gromacs/PKGBUILD community/gtk-gnutella/PKGBUILD community/gtk-rezlooks-engine/PKGBUILD community/handbrake/PKGBUILD community/jogl/PKGBUILD community/kydpdict/PKGBUILD community/libast/PKGBUILD community/libcgi/PKGBUILD community/libxnvctrl/PKGBUILD community/mhwaveedit/PKGBUILD community/microblog-purple/PKGBUILD community/mms_client/PKGBUILD community/mplayer2/PKGBUILD community/multiget/PKGBUILD community/multimux/PKGBUILD community/musescore/PKGBUILD community/mysql-ruby/PKGBUILD community/mysql-workbench/PKGBUILD community/nas/PKGBUILD community/ocaml-extlib/PKGBUILD community/ocaml-ounit/PKGBUILD community/paraview/fix-boost-graph-api-changes.diff community/pcb/PKGBUILD community/pdftrans/PKGBUILD community/python-daap/PKGBUILD community/python2-cheetah/PKGBUILD community/qdevelop/PKGBUILD community/qtoctave/PKGBUILD community/rep-gtk/PKGBUILD community/sauerbraten/PKGBUILD community/sawfish/PKGBUILD community/scilab/PKGBUILD community/superswitcher/PKGBUILD community/tagtool/PKGBUILD community/tora/PKGBUILD community/wml/PKGBUILD community/wxsvg/PKGBUILD community/xskat/PKGBUILD core/eglibc/glibc.install core/eglibc/locale-gen core/eglibc/locale.gen.txt core/eglibc/nscd core/syslog-ng/PKGBUILD extra/blender/PKGBUILD extra/cups/PKGBUILD extra/hplip/PKGBUILD extra/kile/PKGBUILD extra/monodevelop-debugger-mdb/PKGBUILD extra/perl-ev/PKGBUILD multilib/lib32-qt/PKGBUILD testing/kaffeine/kaffeine.install testing/kdebase-runtime/PKGBUILD testing/kdebase-runtime/kdebase-runtime.install testing/kdebase-runtime/libqzeitgeist08.patch testing/libdrm/PKGBUILD testing/libdrm/no-pthread-stubs.patch
Diffstat (limited to 'extra/vlc')
-rw-r--r--extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch b/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch
deleted file mode 100644
index e63b3f97b..000000000
--- a/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 15a821886296a8efe5f8b9015b6e9c5ae5e3ae79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Tue, 11 Oct 2011 19:19:21 +0300
-Subject: Set channel map when using PulseAudio 1.0
-
-(cherry picked from commit ca2cb5f01340252a85ad5bed877e84407f092b21)
----
- modules/audio_output/pulse.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
-index d67dc31..18ee280 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -640,6 +640,7 @@ static int Open(vlc_object_t *obj)
- formatv[formatc]->encoding = encoding;
- pa_format_info_set_rate(formatv[formatc], ss.rate);
- pa_format_info_set_channels(formatv[formatc], ss.channels);
-+ pa_format_info_set_channel_map(formatv[formatc], &map);
- formatc++;
- }
-
-@@ -649,6 +650,7 @@ static int Open(vlc_object_t *obj)
- pa_format_info_set_sample_format(formatv[formatc], ss.format);
- pa_format_info_set_rate(formatv[formatc], ss.rate);
- pa_format_info_set_channels(formatv[formatc], ss.channels);
-+ pa_format_info_set_channel_map(formatv[formatc], &map);
- formatc++;
-
- /* Create a playback stream */
---
-1.7.4.1
-