[SCM] vlc/master: Refresh 200_osdmenu_paths.patch.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Thu Oct 6 23:44:18 UTC 2011


The following commit has been merged in the master branch:
commit 33bf27e19010def3fdc247def53fa7ad754c371d
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Oct 7 00:01:57 2011 +0200

    Refresh 200_osdmenu_paths.patch.

diff --git a/debian/patches/200_osdmenu_paths.patch b/debian/patches/200_osdmenu_paths.patch
index 3af9dc6..c9420b9 100644
--- a/debian/patches/200_osdmenu_paths.patch
+++ b/debian/patches/200_osdmenu_paths.patch
@@ -9,14 +9,13 @@ Description: Use the installed files for osdmenu rather than the ones in the
  action	key-play-pause (0,0)
  	unselect unselected.png
  	select   selection/play_pause.png
---- a/modules/video_filter/osdmenu.c
-+++ b/modules/video_filter/osdmenu.c
-@@ -105,7 +105,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
+--- a/modules/video_filter/Modules.am
++++ b/modules/video_filter/Modules.am
+@@ -24,6 +24,7 @@
+ libosdmenu_plugin_la_LIBADD = $(AM_LIBADD)
+ libosdmenu_plugin_la_DEPENDENCIES =
+ EXTRA_LTLIBRARIES += libosdmenu_plugin.la
++libvlc_LTLIBRARIES += $(LTLIBosdmenu)
  
- #define OSD_UPDATE_MIN     0
+ SOURCES_remoteosd = remoteosd.c remoteosd_rfbproto.h
+ SOURCES_magnify = magnify.c

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list