rpms/vlc/F-11 sources,1.14,1.15 vlc.spec,1.36,1.37

[NicolasChauvet]

Author: kwizart

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

Modified Files:
	sources vlc.spec 
Log Message:
Sync with devel



Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 May 2009 11:34:29 -0000	1.14
+++ sources	18 Jun 2009 10:28:01 -0000	1.15
@@ -1 +1,3 @@
-c0fe6fff896c165abb5bf949616a1eee  vlc-1.0.0-rc2.tar.bz2
+a897e4f24fb3fb993db7daf5a5f4d551  enc_base.h
+c64e9e104b1eeba838a6c87435c6533c  shine.c
+d8cefe26c0b734777c371db163c09bda  vlc-1.0.0-rc4.tar.bz2


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/vlc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vlc.spec	17 Jun 2009 17:27:04 -0000	1.36
+++ vlc.spec	18 Jun 2009 10:28:01 -0000	1.37
@@ -61,6 +61,7 @@
 BuildRequires:	hal-devel
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:  libavc1394-devel
+BuildRequires:	libass-devel
 BuildRequires:	libcaca-devel
 BuildRequires:	libcddb-devel
 BuildRequires:	libcdio-devel >= 0.77-3
@@ -80,7 +81,6 @@
 BuildRequires:	libmtp-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
-BuildRequires:	libraw1394-devel
 BuildRequires:	librsvg2-devel >= 2.9.0
 BuildRequires:	libsysfs-devel
 BuildRequires:  libshout-devel
@@ -256,7 +256,7 @@
 
 
 rm modules/access/videodev2.h
-ln -sf %{_includedir}/videodev2.h modules/access/
+ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
 #rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
 #./bootstrap
 
@@ -291,8 +291,8 @@
 %endif
 %if %with_dc1394
 	--enable-dc1394				\
-	--enable-dv				\
 %endif
+	--enable-dv				\
 	--enable-opencv				\
 	--enable-pvr				\
 	--enable-gnomevfs			\
@@ -309,6 +309,8 @@
 	--enable-tarkin				\
 	--enable-theora				\
 	--enable-dirac				\
+	--enable-libass				\
+	--enable-asademux			\
 	--enable-xcb				\
 	--enable-svg				\
 	--enable-snapshot			\