UPdate to 1.1.12

0001-port-to-FFmpeg-0.8-API.patch

@@ -1,87 +0,0 @@
-From 02d07530a2ef11acee153137fcccfbe124b2b9e6 Mon Sep 17 00:00:00 2001
-From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
-Date: Sun, 4 Sep 2011 23:58:53 +0200
-Subject: [PATCH] port to FFmpeg-0.8 API
-
-Reworked to allow older ffmpeg version
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- modules/stream_out/switcher.c |   41 ++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 40 insertions(+), 1 deletions(-)
-
-diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
-index ca57a28..0b48a71 100644
---- a/modules/stream_out/switcher.c
-+++ b/modules/stream_out/switcher.c
-@@ -358,6 +358,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
-         /* Set CPU capabilities */
-         unsigned i_cpu = vlc_CPU();
-         id->ff_enc_c->dsp_mask = 0;
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         if( !(i_cpu & CPU_CAPABILITY_MMX) )
-         {
-             id->ff_enc_c->dsp_mask |= FF_MM_MMX;
-@@ -375,7 +376,25 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
-             id->ff_enc_c->dsp_mask |= FF_MM_SSE;
-             id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
-         }
--
-+#else
-+        if( !(i_cpu & CPU_CAPABILITY_MMX) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
-+        }
-+        if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
-+        }
-+        if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
-+        }
-+        if( !(i_cpu & CPU_CAPABILITY_SSE) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
-+        }
-+#endif
-         id->ff_enc_c->sample_rate = p_fmt->audio.i_rate;
-         id->ff_enc_c->channels    = p_fmt->audio.i_channels;
-         id->ff_enc_c->bit_rate    = p_fmt->i_bitrate;
-@@ -747,6 +766,7 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
-         /* Set CPU capabilities */
-         unsigned i_cpu = vlc_CPU();
-         id->ff_enc_c->dsp_mask = 0;
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         if( !(i_cpu & CPU_CAPABILITY_MMX) )
-         {
-             id->ff_enc_c->dsp_mask |= FF_MM_MMX;
-@@ -764,6 +784,25 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
-             id->ff_enc_c->dsp_mask |= FF_MM_SSE;
-             id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
-         }
-+#else
-+        if( !(i_cpu & CPU_CAPABILITY_MMX) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
-+        }
-+        if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
-+        }
-+        if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
-+        }
-+        if( !(i_cpu & CPU_CAPABILITY_SSE) )
-+        {
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
-+        }
-+#endif
- 
-         id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width;
-         id->ff_enc_c->height = p_sys->p_pictures[p_sys->i_cmd-1].format.i_height;
--- 
-1.7.4.4
-

vlc.spec

@@ -1,7 +1,7 @@
 #global live555_date		2009.07.28
 #global vlc_rc			-rc3
 %global vlc_bootstrap		1
-%global tarball_version         1.1.11
+%global tarball_version         1.1.12
 %global _with_workaround_circle_deps 1
 %global _with_freeworld 1
 %if 0%{?_with_freeworld:1}
@@ -25,8 +25,8 @@
 
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
-Version:	1.1.11
-Release:	2%{?dist}
+Version:	1.1.12
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
@@ -38,8 +38,6 @@ Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
 Patch5:         vlc-1.1.8-bugfix.opencv22.patch
-Patch6:		vlc-1.1-bugfix-20110920.patch
-Patch7:		0001-port-to-FFmpeg-0.8-API.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -253,8 +251,6 @@ JACK audio plugin for the VLC media player.
 %patch5 -p1 -b .opencv22
 %endif
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
-%patch6 -p1
-%patch7 -p1 -b .ff08
 
 rm modules/access/videodev2.h
 ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -565,6 +561,9 @@ fi || :
 
 
 %changelog
+* Fri Oct 07 2011 Nicolas Chauvet <kwizart@gmail.com> - 1.1.12-1
+- Update to 1.1.12
+
 * Tue Sep 20 2011 Nicolas Chauvet <kwizart@gmail.com> - 1.1.11-2
 - Update to current bugfix
 - Add patch for FFmpeg-0.8