packages: vlc/vlc-osdmenu_build.patch, vlc/vlc.spec - up to 1.1.13

[lisu]

Author: lisu                         Date: Thu Dec 22 10:08:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.1.13

---- Files affected:
packages/vlc:
   vlc-osdmenu_build.patch (1.1 -> 1.2) , vlc.spec (1.281 -> 1.282) 

---- Diffs:

================================================================
Index: packages/vlc/vlc-osdmenu_build.patch
diff -u packages/vlc/vlc-osdmenu_build.patch:1.1 packages/vlc/vlc-osdmenu_build.patch:1.2
--- packages/vlc/vlc-osdmenu_build.patch:1.1	Fri Nov 11 15:54:08 2011
+++ packages/vlc/vlc-osdmenu_build.patch	Thu Dec 22 11:08:11 2011
@@ -1,14 +1,13 @@
-diff -urNp vlc-1.1.12.orig/modules/video_filter/Modules.am vlc-1.1.12/modules/video_filter/Modules.am
---- vlc-1.1.12.orig/modules/video_filter/Modules.am	2011-11-11 15:49:18.410000002 +0100
-+++ vlc-1.1.12/modules/video_filter/Modules.am	2011-11-11 15:47:24.430000002 +0100
-@@ -23,7 +23,10 @@ libosdmenu_plugin_la_SOURCES = osdmenu.c
+--- vlc-1.1.13/modules/video_filter/Modules.am~	2011-10-07 22:31:47.000000000 +0200
++++ vlc-1.1.13/modules/video_filter/Modules.am	2011-12-22 11:07:00.437871107 +0100
+@@ -23,8 +23,11 @@
  libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\"
  libosdmenu_plugin_la_LIBADD = $(AM_LIBADD)
  libosdmenu_plugin_la_DEPENDENCIES =
--EXTRA_LTLIBRARIES += libosdmenu_plugin.la
 +
 +if BUILD_OSDMENU
-+libvlc_LTLIBRARIES += libosdmenu_plugin.la
+ EXTRA_LTLIBRARIES += libosdmenu_plugin.la
+ libvlc_LTLIBRARIES += $(LTLIBosdmenu)
 +endif
  
  SOURCES_remoteosd = remoteosd.c remoteosd_rfbproto.h

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.281 packages/vlc/vlc.spec:1.282
--- packages/vlc/vlc.spec:1.281	Tue Dec 20 20:43:01 2011
+++ packages/vlc/vlc.spec	Thu Dec 22 11:08:11 2011
@@ -41,13 +41,13 @@
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
-Version:	1.1.12
-Release:	3
+Version:	1.1.13
+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:	91de1ad308c947e35380f9d747ff5713
+# Source0-md5:	9678fb7a04808b6e0de63746d35e4bb1
 Patch0:		%{name}-buildflags.patch
 Patch1:		%{name}-defaultfont.patch
 Patch2:		%{name}-osdmenu_path.patch
@@ -863,6 +863,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282  2011/12/22 10:08:11  lisu
+- up to 1.1.13
+
 Revision 1.281  2011/12/20 19:43:01  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc-osdmenu_build.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.281&r2=1.282&f=u