packages: vlc/vlc.spec, vlc/vlc-osdmenu_build.patch (NEW) - build OSD menu, ...

[gotar]

Author: gotar                        Date: Fri Nov 11 14:54:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build OSD menu, enabled Kate streams rendering, updated R versions

---- Files affected:
packages/vlc:
   vlc.spec (1.276 -> 1.277) , vlc-osdmenu_build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.276 packages/vlc/vlc.spec:1.277
--- packages/vlc/vlc.spec:1.276	Fri Nov 11 14:22:14 2011
+++ packages/vlc/vlc.spec	Fri Nov 11 15:54:08 2011
@@ -20,7 +20,6 @@
 %bcond_without	ggi		# don't build ggi plugin
 %bcond_without	gnomevfs	# gnomevfs plugin
 %bcond_without	gnutls		# gnutls plugin
-%bcond_with	hal		# build with hal support
 %bcond_without	jack		# jack audio module
 %bcond_without	lirc		# build without lirc support
 %bcond_without	live		# build without live.com support
@@ -54,6 +53,7 @@
 Patch2:		%{name}-osdmenu_path.patch
 Patch3:		%{name}-system-minizip.patch
 Patch4:		%{name}-upnp.patch
+Patch5:		%{name}-osdmenu_build.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -93,13 +93,13 @@
 BuildRequires:	libdvbpsi-devel >= 0.1.6
 BuildRequires:	libdvdnav-devel
 BuildRequires:	libdvdread-devel
-BuildRequires:	libebml-devel >= 0.7.6
+BuildRequires:	libebml-devel >= 0.7.7
 BuildRequires:	libgcrypt-devel
 %{?with_ggi:BuildRequires:	libggi-devel}
 #BuildRequires:	libid3tag-devel
 BuildRequires:	libkate-devel
 BuildRequires:	libmad-devel
-BuildRequires:	libmatroska-devel >= 0.7.5
+BuildRequires:	libmatroska-devel >= 0.8.0
 BuildRequires:	libmodplug-devel
 BuildRequires:	libmpcdec-devel >= 1.2.1
 BuildRequires:	libmpeg2-devel
@@ -115,6 +115,7 @@
 BuildRequires:	libsmbclient-devel
 BuildRequires:	libtar-devel
 BuildRequires:	libtheora-devel
+BuildRequires:	libtiger-devel
 BuildRequires:	libtool
 %{?with_upnp:BuildRequires:	libupnp-devel}
 BuildRequires:	libv4l-devel
@@ -128,7 +129,7 @@
 BuildRequires:	lua51-devel
 BuildRequires:	minizip-devel
 BuildRequires:	ncurses-devel
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 0.9.0
 %{?with_portaudio:BuildRequires:	portaudio-devel}
 BuildRequires:	pulseaudio-devel
 BuildRequires:	qt4-build
@@ -300,6 +301,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -375,7 +377,6 @@
 	%{!?with_x264:--disable-x264} \
 	--enable-xosd \
 	--enable-oss \
-	%{!?with_hal:--disable-hal} \
 	%{!?with_projectM:--disable-projectm} \
 	--disable-optimizations # we use own RPM_OPT_FLAGS optimalizations
 
@@ -685,7 +686,6 @@
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 %dir %{_libdir}/vlc/plugins/services_discovery
-#%%{?with_hal:%attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libhal_plugin.so}
 %{?with_bonjour:%attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so}
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so
@@ -861,6 +861,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.277  2011/11/11 14:54:08  gotar
+- build OSD menu, enabled Kate streams rendering, updated R versions
+
 Revision 1.276  2011/11/11 13:22:14  gotar
 - HAL is obsoleted
 

================================================================
Index: packages/vlc/vlc-osdmenu_build.patch
diff -u /dev/null packages/vlc/vlc-osdmenu_build.patch:1.1
--- /dev/null	Fri Nov 11 15:54:14 2011
+++ packages/vlc/vlc-osdmenu_build.patch	Fri Nov 11 15:54:08 2011
@@ -0,0 +1,15 @@
+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
+ 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
++endif
+ 
+ SOURCES_remoteosd = remoteosd.c remoteosd_rfbproto.h
+ SOURCES_magnify = magnify.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.276&r2=1.277&f=u