[SCM] VLC media player packaging branch, lucid, updated. debian/1.0.4-1ubuntu1

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Dec 30 17:38:05 UTC 2009


The following commit has been merged in the lucid branch:
commit 0d833a9c458b510c5755d3e82aa17c66bc06d438
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Dec 30 18:21:42 2009 +0100

    remove patches that have been applied upstream

diff --git a/debian/patches/402_increase_pulseaudio_score.diff b/debian/patches/402_increase_pulseaudio_score.diff
deleted file mode 100644
index 6ff43f4..0000000
--- a/debian/patches/402_increase_pulseaudio_score.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Rémi Denis-Courmont <remi at remlab.net>
-Date: Wed, 2 Sep 2009 16:44:55 +0000 (+0300)
-Subject: PulseAudio: higher priority than ALSA
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=7c4ca246a6be1d76bca3482893d5e1b35c5c7fb9
-
-PulseAudio: higher priority than ALSA
-
-Without this, the PulseAudio output is completely useless. PulseAudio
-provides ALSA emulation, so VLC would always use ALSA. Now, it will use
-ALSA if PulseAudio is not available, but avoid the PulseAudio ALSA
-emulation which makes more sense. Either way, if your PulseAudio setup
-is broken, you are screwed - this change makes no difference.
----
-
-diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
-index 2fc17a4..f915a6b 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -97,7 +97,7 @@ static void uninit(aout_instance_t *p_aout);
- vlc_module_begin ()
-     set_shortname( "Pulse Audio" )
-     set_description( N_("Pulseaudio audio output") )
--    set_capability( "audio output", 40 )
-+    set_capability( "audio output", 160 )
-     set_category( CAT_AUDIO )
-     set_subcategory( SUBCAT_AUDIO_AOUT )
-     add_shortcut( "pulseaudio" )
diff --git a/debian/patches/403_ugly-hack-to-prevent-qt4-x11-from-using-alpha-channel.diff b/debian/patches/403_ugly-hack-to-prevent-qt4-x11-from-using-alpha-channel.diff
deleted file mode 100644
index 551d157..0000000
--- a/debian/patches/403_ugly-hack-to-prevent-qt4-x11-from-using-alpha-channel.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Rémi Denis-Courmont <remi at remlab.net>
-Date: Sun, 15 Nov 2009 15:03:17 +0000 (+0200)
-Subject: Ugly hack to prevent qt4-x11 from using alpha channel
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=c0ec5be56e71c273eef4faea8d927eeb3cbc7ec5;hp=493ed6ef7ff138e7b93f31e962bb28dfa06d928b
-
-Ugly hack to prevent qt4-x11 from using alpha channel
-
-This breaks our current Xlib XVideo and plain X11 outputs.
-Qt4 would create an ARGB window for our embedded video. Then, the
-Xlib plugins would raise BadMatch errors and VLC aborts. Starting
-cairo-dock is an easy way to trigger this problem.
-(With XCB plugins, we fail safe to OpenGL/GLX instead of crashing.)
-
-We should instead handle ARGB visuals properly. But that would involve
-more efforts, and would only enable plain X11, not XVideo anyway.
-
-This should work around LP#416294.
----
-
-diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
-index 49e7732..d005434 100644
---- a/modules/gui/qt4/qt4.cpp
-+++ b/modules/gui/qt4/qt4.cpp
-@@ -282,6 +282,7 @@ static int Open( vlc_object_t *p_this )
-         return VLC_EGENERIC;
-     }
-     XCloseDisplay( p_display );
-+    putenv( "XLIB_SKIP_ARGB_VISUALS=1" );
- #endif
- 
-     /* Allocations of p_sys */
diff --git a/debian/patches/series b/debian/patches/series
index df3735f..5fb4fc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,5 @@
 200_osdmenu_paths.diff
 300_manpage_syntax.diff
 401_i420_mmx_pic.diff
-402_increase_pulseaudio_score.diff
-403_ugly-hack-to-prevent-qt4-x11-from-using-alpha-channel.diff
 501_decrease_alsa_buffer.diff
 502_fix_typo.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list