rpms/vlc/F-13 vlc-1.1.6-hardode_font_patch.patch, NONE, 1.1 vlc-backport-lirc_fix.patch, NONE, 1.1 vlc-backport-signal_fix.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 sources, 1.35, 1.36 vlc.spec, 1.89, 1.90 vlc-1.1.0-pending-taglib-not-tread_safe.patch, 1.1, NONE vlc-1.1.4-hardode_font_patch.patch, 1.1, NONE vlc-handlers.schemas, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23844/F-13

Modified Files:
	.cvsignore sources vlc.spec 
Added Files:
	vlc-1.1.6-hardode_font_patch.patch vlc-backport-lirc_fix.patch 
	vlc-backport-signal_fix.patch 
Removed Files:
	vlc-1.1.0-pending-taglib-not-tread_safe.patch 
	vlc-1.1.4-hardode_font_patch.patch vlc-handlers.schemas 
Log Message:
Sync with devel


vlc-1.1.6-hardode_font_patch.patch:
 projectm.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vlc-1.1.6-hardode_font_patch.patch ---
diff -up vlc-1.1.6/modules/visualization/projectm.cpp.hardode_path vlc-1.1.6/modules/visualization/projectm.cpp
--- vlc-1.1.6/modules/visualization/projectm.cpp.hardode_path   2011-01-17 17:30:54.000000000 +0100
+++ vlc-1.1.6/modules/visualization/projectm.cpp        2011-01-25 10:55:30.791607002 +0100
@@ -89,9 +89,9 @@ vlc_module_begin ()
     add_directory( "projectm-preset-path", "/usr/share/projectM/presets", NULL,
 #endif
                    PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
-    add_file( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", NULL,
+    add_file( "projectm-title-font", "/usr/share/fonts/dejavu/DejaVuSans.ttf", NULL,
               TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
-    add_file( "projectm-menu-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", NULL,
+    add_file( "projectm-menu-font", "/usr/share/fonts/dejavu/DejaVuSansMono.ttf", NULL,
               MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
 #endif
     add_integer( "projectm-width", 800, NULL, WIDTH_TEXT, WIDTH_LONGTEXT,

vlc-backport-lirc_fix.patch:
 lirc.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE vlc-backport-lirc_fix.patch ---
commit 942ab6c31026a84e4c5503cb8e68a5135dfc2f2b
Author: Pierre Ynard <linkfanel at yahoo.fr>
Date:   Sun Jan 23 18:19:05 2011 +0100

    lirc: build fix

diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index aee33c3..e8c4780 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -25,6 +25,7 @@
  * Preamble
  *****************************************************************************/
 
+#include <errno.h>
 #include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
@@ -154,10 +155,12 @@
         /* Wait for data */
         struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 };
         if( poll( &ufd, 1, -1 ) == -1 )
+        {
             if( errno == EINTR )
                 continue;
             else
                 break;
+        }
 
         /* Process */
         int canc = vlc_savecancel();

vlc-backport-signal_fix.patch:
 override.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE vlc-backport-signal_fix.patch ---
commit de68b12937589cdcbe5143f162dabd7654969362
Author: Rémi Denis-Courmont <remi at remlab.net>
Date:   Sat Jul 24 13:43:56 2010 +0300

    Do not override signal functions for the time being

diff --git a/bin/override.c b/bin/override.c
index 2385f2b..ac9e14c 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -201,6 +201,7 @@ int rand (void)
 }
 
 
+#if 0
 /** Signals **/
 #include <signal.h>
 
@@ -252,6 +253,7 @@ error:
     LOG("Blocked", "%d, %p, %p", signum, act, old);
     return -1;
 }
+#endif
 
 
 /*** Locales ***



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	14 Nov 2010 22:57:20 -0000	1.29
+++ .cvsignore	28 Jan 2011 09:47:00 -0000	1.30
@@ -1 +1 @@
-vlc-1.1.5.tar.bz2
+vlc-1.1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	14 Nov 2010 22:57:20 -0000	1.35
+++ sources	28 Jan 2011 09:47:00 -0000	1.36
@@ -1 +1 @@
-fdc23693351ed57af9f4c85ea885b536  vlc-1.1.5.tar.bz2
+c47f3ebc886f2aff8c95b98c564d1759  vlc-1.1.6.tar.bz2


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- vlc.spec	14 Nov 2010 22:57:20 -0000	1.89
+++ vlc.spec	28 Jan 2011 09:47:00 -0000	1.90
@@ -17,12 +17,16 @@
 %global _with_live555 --with-live555
 %global _with_vaapi --with-vaapi
 %endif
-
+%if 0%{?fedora} > 14
+# Those need works in Rawhide
+%global _without_opencv 1
+%global _without_mozilla 1
+%endif
 
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
-Version:	1.1.5
-Release:	1%{?dist}
+Version:	1.1.6
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
@@ -32,8 +36,10 @@
 %endif
 Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch1:		0001-Libnotify-depends-on-a-gtk.patch
-Patch3:		vlc-1.1.4-hardode_font_patch.patch
+Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
+Patch5:		vlc-backport-lirc_fix.patch
+Patch6:         vlc-backport-signal_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -88,6 +94,7 @@
 BuildRequires:	libprojectM-qt-devel
 BuildRequires:	libproxy-devel
 BuildRequires:	librsvg2-devel >= 2.9.0
+BuildRequires:  librtmp-devel
 BuildRequires:	libssh2-devel
 BuildRequires:	libsysfs-devel
 BuildRequires:	libshout-devel
@@ -113,7 +120,7 @@
 BuildRequires:	minizip-devel
 %{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
 BuildRequires:	ncurses-devel
-BuildRequires:	opencv-devel
+%{!?_without_opencv:BuildRequires: opencv-devel}
 BuildRequires:	openslp-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pulseaudio-libs-devel >= 0.9.8
@@ -162,6 +169,8 @@
 %endif
 Requires: qt4%{?_isa} >= %{_qt4_version}
 
+#For xdg-sreensaver
+Requires: xdg-utils
 
 
 
@@ -206,17 +215,20 @@
 Provides:	ffmpeg4vlc-devel = 0.6-0.5
 Obsoletes:	ffmpeg4vlc-libs < 0.6-0.5
 Obsoletes:	ffmpeg4vlc-devel < 0.6-0.5
+%{?live555date:Requires: live555date%{_isa} = %{live555date}}
 
 %description core
 VLC media player core components
 
-%package nox
-Summary:	VLC media player without Xorg
+%package extras
+Summary:	VLC media player with extras modules
 Group:		Applications/Multimedia
 Requires:	vlc-core%{_isa} = %{version}-%{release}
+Provides:	vlc-nox = %{version}-%{release}
+Obsoletes:	vlc-nox < 1.1.5-2
 
-%description nox
-VLC media player with frame-buffer support for X-less server.
+%description extras
+VLC media player extras modules.
 
 %package plugin-jack
 Summary:	JACK audio plugin for VLC
@@ -236,6 +248,8 @@
 %patch1 -p1 -b .gtk23
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
+%patch5 -p1 -b .lirc_fix
+%patch6 -p1 -b .signal_fix
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 
 rm modules/access/videodev2.h
@@ -276,7 +290,7 @@
 	--with-live555-tree=live		\
 %endif
 	--enable-dv				\
-	--enable-opencv				\
+%{!?_without_opencv:--enable-opencv} \
 	--enable-sftp				\
 	--enable-pvr				\
 	--enable-gnomevfs			\
@@ -361,7 +375,10 @@
   $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSansBold.ttf
 
 #Clear execstak
-#execstack -c $RPM_BUILD_ROOT%{_bindir}/vlc
+%ifarch %{ix86}
+execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
+execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/librealvideo_plugin.so
+%endif
 
 #Fix unowned directories
 rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
@@ -395,7 +412,7 @@
 %posttrans core
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
 
-%post nox
+%post extras
 if [ $1 == 1 ] ; then
   %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
 fi
@@ -405,7 +422,7 @@
   %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
 fi
 
-%postun nox
+%postun extras
 if [ $1 == 0 ] ; then
   %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
 fi
@@ -436,9 +453,6 @@
 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
 %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
 %{_libdir}/vlc/plugins/misc/libsvg_plugin.so
-%if 0%{?fedora} < 15
-%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
-%endif
 %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
 %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
 %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
@@ -447,8 +461,6 @@
 %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
 %{?_with_xosd:%{_libdir}/vlc/plugins/misc/libxosd_plugin.so}
 %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
-%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
-%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
 %endif
@@ -489,8 +501,10 @@
 %exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
 }
 %exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%{!?_without_opencv:
 %exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
 %exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+}
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 %exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
 %endif
@@ -508,11 +522,18 @@
 %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
 
-%files nox
+%files extras
 %defattr(-,root,root,-)
 %{!?_without_directfb:
 %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
 }
+%if 0%{?fedora} < 15
+%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
+%endif
+%{!?_without_opencv:
+%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
+%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+}
 %ifarch %{ix86} x86_64
 %{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
 %endif
@@ -536,8 +557,18 @@
 
 
 %changelog
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.6-2
+- Update to 1.1.6
+- backport lirc and signal fixes
+
+* Sat Dec 18 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.5-2
+-  Clear execstack on dmo and real plugin for i686
+
 * Sun Nov 14 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.5-1
 - Update to 1.1.5
+- Rename nox subpackage to extras
+- Move opencv modules to extras
+- Move libnotify module to extras until f15
 
 * Wed Nov 10 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.4-6
 - Disable notify by f15 - deprecated upstream


--- vlc-1.1.0-pending-taglib-not-tread_safe.patch DELETED ---


--- vlc-1.1.4-hardode_font_patch.patch DELETED ---


--- vlc-handlers.schemas DELETED ---