rpms/vlc/devel vlc-0.9.8a-embeddedvideo.patch, NONE, 1.1 vlc-pulse0071.patch, NONE, 1.1 vlc.spec, 1.15, 1.16 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8

[NicolasChauvet]

Author: kwizart

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

Modified Files:
	vlc.spec .cvsignore sources 
Added Files:
	vlc-0.9.8a-embeddedvideo.patch vlc-pulse0071.patch 
Log Message:
- Update to 0.9.8a
Security update:
 * Fixed buffer overflow in Real demuxer (SA-0811, CVE-2008-5276)
- Add pulse0071 Patch
- Fix RPM Fusion bugs:
  https://bugzilla.rpmfusion.org/show_bug.cgi?id=201
  https://bugzilla.rpmfusion.org/show_bug.cgi?id=155


vlc-0.9.8a-embeddedvideo.patch:

--- NEW FILE vlc-0.9.8a-embeddedvideo.patch ---
diff -up vlc-0.9.8a/modules/gui/qt4/qt4.cpp.embedded vlc-0.9.8a/modules/gui/qt4/qt4.cpp
--- vlc-0.9.8a/modules/gui/qt4/qt4.cpp.embedded	2008-12-05 02:27:20.000000000 +0100
+++ vlc-0.9.8a/modules/gui/qt4/qt4.cpp	2008-12-05 02:27:27.000000000 +0100
@@ -213,7 +213,7 @@ vlc_module_begin();
 
         set_callbacks( OpenDialogs, Close );
 
-#if 0
+#if 1
     add_submodule();
         set_capability( "vout window", 50 );
         set_callbacks( WindowOpen, WindowClose );

vlc-pulse0071.patch:

--- NEW FILE vlc-pulse0071.patch ---
--- pulse.c	2008-09-18 22:03:35.000000000 +0100
+++ vlc-0.9.4/modules/audio_output/pulse.c	2008-12-04 11:43:43.000000000 +0000
@@ -123,13 +123,52 @@
 
     PULSE_DEBUG( "Pulse start initialization");
 
-    ss.rate = p_aout->output.output.i_rate;
-    ss.channels = 2;
+    ss.channels = aout_FormatNbChannels( &p_aout->output.output );	/* Get the input stream channel count */
+
+    /* Setup the pulse audio stream based on the input stream count */
+    switch(ss.channels)
+    {
+        case 8:
+            p_aout->output.output.i_physical_channels
+                = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+                | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT
+                | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+                | AOUT_CHAN_LFE;
+	break;
+
+        case 6:
+            p_aout->output.output.i_physical_channels
+                = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+                | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+                | AOUT_CHAN_LFE;
+	break;
+
+        case 4:
+            p_aout->output.output.i_physical_channels
+                = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+                | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+        break;
+
+        case 2:
+            p_aout->output.output.i_physical_channels
+                = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+        break;
+
+        case 1:
+            p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
+        break;
+    
+	default:
+            msg_Err(p_aout,"Invalid number of channels");
+	goto fail;
+    }
+
+    /* Add a quick command line info message */
+    msg_Info(p_aout, "No. of Audio Channels: %d", ss.channels);
 
-    ss.format = PA_SAMPLE_S16LE;
-    p_aout->output.output.i_physical_channels =
-            AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
-    p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+    ss.rate = p_aout->output.output.i_rate;
+    ss.format = PA_SAMPLE_FLOAT32NE;
+    p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
 
     if (!pa_sample_spec_valid(&ss)) {
         msg_Err(p_aout,"Invalid sample spec");
@@ -148,8 +187,8 @@
 
     p_sys->buffer_size = a.minreq;
 
-    pa_channel_map_init_stereo(&map);
-
+    /* Initialise the speaker map setup above */
+    pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);
 
     if (!(p_sys->mainloop = pa_threaded_mainloop_new())) {
         msg_Err(p_aout, "Failed to allocate main loop");


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vlc.spec	6 Nov 2008 15:37:28 -0000	1.15
+++ vlc.spec	5 Dec 2008 01:52:50 -0000	1.16
@@ -17,7 +17,7 @@
 %define _version %{version}-git
 %define release_tag   0.1.%{vlc_date}git
 %else
-Version:	0.9.6
+Version:	0.9.8a
 %define _version %{version}
 %define release_tag   1
 %endif
@@ -35,9 +35,10 @@
 %endif
 Patch0:         vlc-trunk-default_font.patch
 Patch1:         vlc-0.9.2-pulse_default.patch
-Patch2:         vlc-embeddedvideo.patch
+Patch2:         vlc-0.9.8a-embeddedvideo.patch
 Patch3:         300_all_pic.patch
 Patch4:         310_all_mmx_pic.patch
+Patch5:         vlc-pulse0071.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -178,8 +179,11 @@
 
 
 Requires: vlc-core = %{version}-%{release}
+%if 0%{?fedora} > 10
+Requires: dejavu-fonts-sans
+%else
 Requires: dejavu-fonts
-
+%endif
 
 %package devel
 Summary:	Development package for %{name}
@@ -261,11 +265,12 @@
 %endif
 %patch0 -p1 -b .default_font
 %patch1 -p1 -b .pulse_default
-%patch2 -p1 -b .embedded
+#patch2 -p1 -b .embedded
 #http://trac.videolan.org/vlc/ticket/1383
 %patch3 -p1 -b .dmo_pic
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 %patch4 -p1 -b .mmx_pic
+%patch5 -p1 -b .pulse0071
 
 chmod -x modules/gui/qt4/qt4*
 #./bootstrap
@@ -400,6 +405,8 @@
 #Clear execstak
 execstack -c $RPM_BUILD_ROOT%{_bindir}/vlc
 
+#Fix unowned directories
+rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
 
 %find_lang %{name}
 
@@ -430,7 +437,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README THANKS
-%doc %{_docdir}/vlc/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/vlc.png
 %{_datadir}/vlc/skins2/
@@ -535,6 +541,15 @@
 
 
 %changelog
+* Fri Dec  5 2008 kwizart < kwizart at gmail.com > - 0.9.8a-1
+- Update to 0.9.8a
+Security update:
+ * Fixed buffer overflow in Real demuxer (SA-0811, CVE-2008-5276)
+- Add pulse0071 Patch
+- Fix RPM Fusion bugs:
+  https://bugzilla.rpmfusion.org/show_bug.cgi?id=201
+  https://bugzilla.rpmfusion.org/show_bug.cgi?id=155
+
 * Thu Nov  6 2008 kwizart < kwizart at gmail.com > - 0.9.6-1
 - Update to 0.9.6
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2008 15:37:28 -0000	1.7
+++ .cvsignore	5 Dec 2008 01:52:50 -0000	1.8
@@ -1 +1 @@
-vlc-0.9.6.tar.bz2
+vlc-0.9.8a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2008 15:37:28 -0000	1.7
+++ sources	5 Dec 2008 01:52:50 -0000	1.8
@@ -1 +1 @@
-cd71276ed867029a6d077a40bccd4d05  vlc-0.9.6.tar.bz2
+8ffa2ff763badd5de7592004d8d69a63  vlc-0.9.8a.tar.bz2