rpms/vlc/devel 0001-QT4-menus-remove-previous-signal-slot-connection-s.patch, NONE, 1.1 0005-Improve-compatibility-with-PA-when-the-vlc-alsa-outp.patch, NONE, 1.1 vlc.spec, 1.36, 1.37

[NicolasChauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17621

Modified Files:
	vlc.spec 
Added Files:
	0001-QT4-menus-remove-previous-signal-slot-connection-s.patch 
	0005-Improve-compatibility-with-PA-when-the-vlc-alsa-outp.patch 
Log Message:
Release 0.10, rc3 coming soon, final in one or two weeks from now


0001-QT4-menus-remove-previous-signal-slot-connection-s.patch:

--- NEW FILE 0001-QT4-menus-remove-previous-signal-slot-connection-s.patch ---
>From 4717657053a13d69d48dc82dbc5402f6712f66ea Mon Sep 17 00:00:00 2001
From: Erwan Tulou <brezhoneg1 at yahoo.fr>
Date: Fri, 5 Jun 2009 09:55:09 +0200
Subject: [PATCH] QT4 menus : remove previous signal-slot connection(s) if any (correct trac #2818)

---
 modules/gui/qt4/menus.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 0a12c20..9304752 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1386,6 +1386,10 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
 
     MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type,
             val, psz_var );
+
+    /* remove previous signal-slot connection(s) if any */
+    action->disconnect( );
+
     CONNECT( action, triggered(), THEDP->menusMapper, map() );
     THEDP->menusMapper->setMapping( action, itemData );
 
-- 
1.5.6.5


0005-Improve-compatibility-with-PA-when-the-vlc-alsa-outp.patch:

--- NEW FILE 0005-Improve-compatibility-with-PA-when-the-vlc-alsa-outp.patch ---
>From dce1b815f87daef89715c9e5bec7ee78a69df79f Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart at gmail.com>
Date: Thu, 4 Jun 2009 15:18:40 +0200
Subject: [PATCH] Improve compatibility with PA when the vlc alsa output is used.

---
 modules/audio_output/alsa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 2d03d1d..dd33f31 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -78,7 +78,7 @@ struct aout_sys_t
    number of channel(s) (eg. 2 for stereo) and the size of a sample (eg.
    2 for int16_t). */
 #define ALSA_DEFAULT_PERIOD_SIZE        1024
-#define ALSA_DEFAULT_BUFFER_SIZE        ( ALSA_DEFAULT_PERIOD_SIZE << 8 )
+#define ALSA_DEFAULT_BUFFER_SIZE        ( ALSA_DEFAULT_PERIOD_SIZE << 4 )
 #define ALSA_SPDIF_PERIOD_SIZE          A52_FRAME_NB
 #define ALSA_SPDIF_BUFFER_SIZE          ( ALSA_SPDIF_PERIOD_SIZE << 4 )
 /* Why << 4 ? --Meuuh */
-- 
1.6.0.6



Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vlc.spec	2 Jun 2009 20:46:53 -0000	1.36
+++ vlc.spec	5 Jun 2009 15:53:06 -0000	1.37
@@ -13,10 +13,10 @@
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
 Version:	1.0.0
-Release:	0.9rc2%{?dist}
+Release:	0.10rc2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-URL:		http://www.videolan.org/
+URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.bz2
 %if %with_internal_live555
 Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
@@ -32,6 +32,7 @@
 Patch5:         vlc-1.0.0-pre1-xulrunner-191_support.patch
 Patch6:         vlc-1.0-bugfix-20090602.patch
 Patch7:         vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch
+Patch9:         0001-QT4-menus-remove-previous-signal-slot-connection-s.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -260,6 +261,7 @@
 %endif
 %patch6 -p1 -b .bugfix
 %patch7 -p1 -b .revert
+%patch9 -p1 -b .disconnect
 
 rm modules/access/videodev2.h
 ln -sf %{_includedir}/videodev2.h modules/access/
@@ -519,6 +521,7 @@
 %exclude %{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so
 %exclude %{_libdir}/vlc/video_filter/libpanoramix_plugin.so
 %exclude %{_libdir}/vlc/audio_output/libjack_plugin.so
+%exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so
 %exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
 %if %with_dc1394
 %exclude %{_libdir}/vlc/access/libdc1394_plugin.so
@@ -529,6 +532,7 @@
 %files plugin-jack
 %defattr(-,root,root,-)
 %{_libdir}/vlc/access/libaccess_jack_plugin.so
+%{_libdir}/vlc/audio_output/libportaudio_plugin.so
 %{_libdir}/vlc/audio_output/libjack_plugin.so
 %{_libdir}/vlc/codec/libfluidsynth_plugin.so
 
@@ -564,6 +568,10 @@
 
 
 %changelog
+* Fri Jun  5 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.10rc2
+- Move some module to avoid dependency
+- Remove previous signal-slot connection(s) if any - vlc trac #2818
+
 * Tue Jun  2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.9rc2
 - Update to current bugfix
 - Revert b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568