0.9rc20.9rc2

.gitignore

@@ -1 +1,3 @@
 vlc-1.0.0-rc2.tar.bz2
+shine.c
+enc_base.h

sources

@@ -1 +1,3 @@
 c0fe6fff896c165abb5bf949616a1eee  vlc-1.0.0-rc2.tar.bz2
+c64e9e104b1eeba838a6c87435c6533c  shine.c
+a897e4f24fb3fb993db7daf5a5f4d551  enc_base.h

vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch

@@ -0,0 +1,66 @@
+diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
+index 86bd6dd..ce133f9 100644
+--- a/modules/audio_output/pulse.c
++++ b/modules/audio_output/pulse.c
+@@ -175,16 +175,17 @@ static int Open ( vlc_object_t *p_this )
+         msg_Err(p_aout,"Invalid sample spec");
+         goto fail;
+     }
++    
++    a.maxlength = pa_bytes_per_second(&ss)/4/pa_frame_size(&ss);
++    a.tlength = a.maxlength*9/10;
++    a.prebuf = a.tlength/2;
++    a.minreq = a.tlength/10;
+ 
+-    /* Reduce overall latency to 200mS to reduce audible clicks
+-     * Also pulse minreq and internal buffers are now 20mS which reduces resampling
+-     */
+-    a.tlength = pa_bytes_per_second(&ss)/5;
+-    a.maxlength = a.tlength * 2;
+-    a.prebuf = a.tlength;
+-    a.minreq = a.tlength / 10;
++    a.maxlength *= pa_frame_size(&ss);
++    a.tlength *= pa_frame_size(&ss);
++    a.prebuf *= pa_frame_size(&ss);
++    a.minreq *= pa_frame_size(&ss);
+ 
+-    /* Buffer size is 20mS */
+     p_sys->buffer_size = a.minreq;
+ 
+     /* Initialise the speaker map setup above */
+@@ -212,7 +213,7 @@ static int Open ( vlc_object_t *p_this )
+     PULSE_DEBUG( "Pulse after context connect");
+ 
+     pa_threaded_mainloop_lock(p_sys->mainloop);
+-
++    
+     if (pa_threaded_mainloop_start(p_sys->mainloop) < 0) {
+         msg_Err(p_aout, "Failed to start main loop");
+         goto unlock_and_fail;
+@@ -239,7 +240,7 @@ static int Open ( vlc_object_t *p_this )
+     pa_stream_set_write_callback(p_sys->stream, stream_request_cb, p_aout);
+     pa_stream_set_latency_update_callback(p_sys->stream, stream_latency_update_cb, p_aout);
+ 
+-    if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0) {
++    if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
+         msg_Err(p_aout, "Failed to connect stream: %s", pa_strerror(pa_context_errno(p_sys->context)));
+         goto unlock_and_fail;
+     }
+@@ -447,11 +448,16 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
+                 latency = 0;
+ 
+             }
+-
+             PULSE_DEBUG( "Pulse stream request latency=%"PRId64"", latency);
+             next_date = mdate() + latency;
+ 
++
+             if(p_sys->start_date < next_date + AOUT_PTS_TOLERANCE ){
++    /*
++                  vlc_mutex_lock( &p_aout->output_fifo_lock );
++                p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
++                vlc_mutex_unlock( &p_aout->output_fifo_lock );
++    */
+                 p_buffer = aout_OutputNextBuffer( p_aout, next_date, 0);
+             }
+         }

vlc.spec

@@ -13,7 +13,7 @@
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
 Version:	1.0.0
-Release:	0.7rc2%{?dist}
+Release:	0.9rc2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -22,12 +22,16 @@ Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
 Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
 %endif
 Source10:       vlc-handlers.schemas
+Source11:       shine.c
+Source12:       enc_base.h
 Patch0:         vlc-trunk-default_font.patch
 Patch1:         0001-Default-libv4l2-to-true.patch
 Patch2:         0002-Default-aout-for-pulse.patch
 Patch3:         300_all_pic.patch
 Patch4:         310_all_mmx_pic.patch
 Patch5:         vlc-1.0.0-pre1-xulrunner-191_support.patch
+Patch6:         vlc-1.0-bugfix-20090602.patch
+Patch7:         vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -68,6 +72,7 @@ BuildRequires:	libdv-devel
 BuildRequires:	libdvbpsi-devel
 BuildRequires:	libdvdnav-devel
 BuildRequires:  libebml-devel
+BuildRequires:	libhildon-devel
 BuildRequires:	libid3tag-devel
 BuildRequires:  libkate-devel
 BuildRequires:  libmad-devel
@@ -245,11 +250,19 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 %if 0%{?fedora} >= 11
 %patch5 -p1 -b .xul191
 %endif
+%patch6 -p1 -b .bugfix
+%patch7 -p1 -b .revert
 
 rm modules/access/videodev2.h
 ln -sf %{_includedir}/videodev2.h modules/access/
+rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
 ./bootstrap
 
+#missing sources
+install -pm 0644 %{SOURCE11} modules/codec/shine
+install -pm 0644 %{SOURCE12} modules/codec/shine
+
+
 
 %build
 %if %with_internal_live555
@@ -282,6 +295,8 @@ popd
 	--enable-pvr				\
 	--enable-gnomevfs			\
 	--enable-cddax				\
+	--enable-wma-fixed			\
+	--enable-shine				\
 	--enable-faad				\
 	--enable-twolame			\
 	--enable-real				\
@@ -534,6 +549,10 @@ fi || :
 
 
 %changelog
+* Tue Jun  2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.9rc2
+- Update to current bugfix
+- Revert b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568
+
 * Wed May 27 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.7rc2
 - Update to 1.0.0-rc2
 - Rebase xulrunner patch for -rc2