- up to 1.1.13

Changed files:
    vlc-osdmenu_build.patch -> 1.2
    vlc.spec -> 1.282

diff --git a/vlc-osdmenu_build.patch b/vlc-osdmenu_build.patch
index e94308217769fefc3c4faf6a2d4cd39a7d44b4fb..bc5660eb1e4f67424384ac2ee60c6f27477354f8 100644 (file)
--- a/vlc-osdmenu_build.patch
+++ b/vlc-osdmenu_build.patch
@@ -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

diff --git a/vlc.spec b/vlc.spec
index 39441915d8a4e9c0019a746ce8cea6430892c2dd..ce09645445caff970ceae6a13a1dbc7377a7cb1c 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -40,13 +40,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