rpms/vlc/F-13 vlc-1.1.8-bugfix.opencv22.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 sources, 1.37, 1.38 vlc.spec, 1.91, 1.92

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	.cvsignore sources vlc.spec 
Added Files:
	vlc-1.1.8-bugfix.opencv22.patch 
Log Message:
Update to 1.1.8


vlc-1.1.8-bugfix.opencv22.patch:
 opencv_example.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vlc-1.1.8-bugfix.opencv22.patch ---
diff -up vlc-1.1.8/modules/video_filter/opencv_example.c.opencv22 vlc-1.1.8/modules/video_filter/opencv_example.c
--- vlc-1.1.8/modules/video_filter/opencv_example.c.opencv22	2010-04-13 02:22:27.000000000 +0200
+++ vlc-1.1.8/modules/video_filter/opencv_example.c	2011-03-23 10:47:05.053097995 +0100
@@ -191,7 +191,7 @@ static picture_t *Filter( filter_t *p_fi
         CvSeq *faces = cvHaarDetectObjects( p_img[0], p_sys->p_cascade,
                                             p_sys->p_storage, 1.15, 5,
                                             CV_HAAR_DO_CANNY_PRUNING,
-                                            cvSize(20, 20) );
+                                            cvSize(0, 0), cvSize(0, 0) );
         //create the video_filter_region_info_t struct
         if (faces && (faces->total > 0))
         {


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	2 Feb 2011 17:24:55 -0000	1.31
+++ .cvsignore	24 Mar 2011 08:39:36 -0000	1.32
@@ -1 +1 @@
-vlc-1.1.7.tar.bz2
+vlc-1.1.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	2 Feb 2011 17:24:55 -0000	1.37
+++ sources	24 Mar 2011 08:39:36 -0000	1.38
@@ -1 +1 @@
-932ce1fa4afa54b56ac0ccc0655667b6  vlc-1.1.7.tar.bz2
+c0065ec11b6fd12167cd440cbe0ef0d9  vlc-1.1.8.tar.bz2


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- vlc.spec	2 Feb 2011 17:24:55 -0000	1.91
+++ vlc.spec	24 Mar 2011 08:39:36 -0000	1.92
@@ -1,6 +1,8 @@
 #global live555_date		2009.07.28
 #global vlc_rc			-rc3
 %global vlc_bootstrap		1
+%global tarball_version         1.1.8
+#global _with_workaround_circle_deps 1
 %global _with_freeworld 1
 %if 0%{?_with_freeworld:1}
 %global _with_a52dec --with-a52dec
@@ -19,13 +21,14 @@
 %endif
 %if 0%{?fedora} > 14
 # Those need works in Rawhide
-%global _without_opencv 1
 %global _without_mozilla 1
+%else
+%global _with_gnomevfs 1
 %endif
 
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
-Version:	1.1.7
+Version:	1.1.8
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -37,6 +40,7 @@
 Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
+Patch5:         vlc-1.1.8-bugfix.opencv22.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -61,7 +65,7 @@
 BuildRequires:	flac-devel
 BuildRequires:	fluidsynth-devel
 BuildRequires:	fribidi-devel
-BuildRequires:	gnome-vfs2-devel
+%{?_with_gnomevfs:BuildRequires: gnome-vfs2-devel}
 BuildRequires:	gnutls-devel >= 1.0.17
 BuildRequires:	gsm-devel
 BuildRequires:	jack-audio-connection-kit-devel
@@ -151,6 +155,7 @@
 
 %{!?_without_mozilla:BuildRequires:  gecko-devel nspr-devel}
 %{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}}
+%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer}
 
 
 Provides: %{name}-xorg%{_isa} = %{version}-%{release}
@@ -238,13 +243,16 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?vlc_rc}
+%setup -q -n %{name}-%{tarball_version}%{?vlc_rc}
 %if 0%{?live555_date:1}
 %setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
 %endif
 %patch0 -p1 -b .noerror
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
+%if 0%{?fedora} >= 15
+%patch5 -p1 -b .opencv22
+%endif
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 
 rm modules/access/videodev2.h
@@ -288,8 +296,8 @@
 %{!?_without_opencv:--enable-opencv} \
 	--enable-sftp				\
 	--enable-pvr				\
-	--enable-gnomevfs			\
-%{?_with_vcdimager--enable-vcdx}		\
+%{?_with_gnomevfs:--enable-gnomevfs}            \
+%{?_with_vcdimager:--enable-vcdx}		\
 %if 0
 %{?_with_freeworld:--enable-wma-fixed} \
 %{?_with_freeworld:--enable-shine} \
@@ -444,7 +452,9 @@
 %{_bindir}/qvlc
 %{_bindir}/svlc
 %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%{?_with_gnomevfs:
 %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
+}
 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
 %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
 %{_libdir}/vlc/plugins/misc/libsvg_plugin.so
@@ -473,7 +483,9 @@
 %{_datadir}/vlc/
 %{_libdir}/*.so.*
 %exclude %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%{?_with_gnomevfs:
 %exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
+}
 %exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
 %exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
 %exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
@@ -552,6 +564,15 @@
 
 
 %changelog
+* Thu Mar 24 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.8-1
+- Update to 1.1.8
+
+* Fri Mar 11 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.8-0.2.1
+- Rebuilt for new x264/FFmpeg
+
+* Mon Mar 07 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.8-0.1.1
+- Update to pre-1.1.8 bugfix git from today
+
 * Wed Feb 02 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.7-1
 - Update to 1.1.7