packages: vlc/vlc-osdmenu_path.patch, vlc/vlc.spec, vlc/vlc-ffmpeg.patch (R...

[gotar]

Author: gotar                        Date: Fri Nov 11 13:12:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 1.1.12

---- Files affected:
packages/vlc:
   vlc-osdmenu_path.patch (1.2 -> 1.3) , vlc.spec (1.274 -> 1.275) , vlc-ffmpeg.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/vlc/vlc-osdmenu_path.patch
diff -u packages/vlc/vlc-osdmenu_path.patch:1.2 packages/vlc/vlc-osdmenu_path.patch:1.3
--- packages/vlc/vlc-osdmenu_path.patch:1.2	Tue Jul  7 23:23:54 2009
+++ packages/vlc/vlc-osdmenu_path.patch	Fri Nov 11 14:12:20 2011
@@ -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

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.274 packages/vlc/vlc.spec:1.275
--- packages/vlc/vlc.spec:1.274	Sun Sep 18 23:22:19 2011
+++ packages/vlc/vlc.spec	Fri Nov 11 14:12:20 2011
@@ -42,19 +42,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
@@ -301,7 +300,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -863,6 +861,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.275  2011/11/11 13:12:20  gotar
+- upgraded to 1.1.12
+
 Revision 1.274  2011/09/18 21:22:19  glen
 - update-desktop-database (.desktop specifies MimeType)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc-osdmenu_path.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.274&r2=1.275&f=u