- upgraded to 1.1.12

Changed files:
    vlc-ffmpeg.patch -> 1.4
    vlc-osdmenu_path.patch -> 1.3
    vlc.spec -> 1.275

diff --git a/vlc-ffmpeg.patch b/vlc-ffmpeg.patch
deleted file mode 100644 (file)
index f75f492..0000000
--- a/vlc-ffmpeg.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- vlc-1.1.11/modules/stream_out/switcher.c~  2010-04-13 02:22:27.000000000 +0200
-+++ vlc-1.1.11/modules/stream_out/switcher.c   2011-07-18 10:50:50.614630948 +0200
-@@ -362,20 +362,20 @@
-         id->ff_enc_c->dsp_mask = 0;
-         if( !(i_cpu & CPU_CAPABILITY_MMX) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_MMX;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
-         }
-         if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
-         }
-         if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
-         }
-         if( !(i_cpu & CPU_CAPABILITY_SSE) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_SSE;
--            id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
-         }
- 
-         id->ff_enc_c->sample_rate = p_fmt->audio.i_rate;
-@@ -751,20 +751,20 @@
-         id->ff_enc_c->dsp_mask = 0;
-         if( !(i_cpu & CPU_CAPABILITY_MMX) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_MMX;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
-         }
-         if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
-         }
-         if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
-         }
-         if( !(i_cpu & CPU_CAPABILITY_SSE) )
-         {
--            id->ff_enc_c->dsp_mask |= FF_MM_SSE;
--            id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
-+            id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
-         }
- 
-         id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width;

diff --git a/vlc-osdmenu_path.patch b/vlc-osdmenu_path.patch
index da0ac36377584804abe3d8483ac9c528cfd71bdf..16231905eff34d6832d3e7dedcbf5093d0dc92f9 100644 (file)
--- a/vlc-osdmenu_path.patch
+++ b/vlc-osdmenu_path.patch
@@ -6,14 +6,3 @@
  action        key-play-pause (0,0)
        unselect unselected.png
        select   selection/play_pause.png
---- vlc.orig/modules/video_filter/osdmenu.c
-+++ vlc/modules/video_filter/osdmenu.c
-@@ -90,7 +90,7 @@
- #if defined( WIN32 ) || defined( UNDER_CE )
- #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
- #else
--#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
-+#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
- #endif
- 
- #define OSD_UPDATE_MIN     0

diff --git a/vlc.spec b/vlc.spec
index 80e82f3c0f3b16547b965c31d57bbc226ed5cf90..e96ee6d833c1a583be147690252f5237234b370e 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -41,19 +41,18 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       1.1.11
-Release:       5
+Version:       1.1.12
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: a64846d6f21ea179ae8e8bfb6f9447fe
+# Source0-md5: 91de1ad308c947e35380f9d747ff5713
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-defaultfont.patch
 Patch2:                %{name}-osdmenu_path.patch
 Patch3:                %{name}-system-minizip.patch
 Patch4:                %{name}-upnp.patch
-Patch5:                %{name}-ffmpeg.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: OpenGL-devel
@@ -300,7 +299,6 @@ Wtyczka do przeglądarki internetowej Mozilla.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .