rpms/vlc/F-9 vlc-0.9.9-fix_playlist.patch, NONE, 1.1 vlc.spec, 1.14, 1.15 sources, 1.8, 1.9

NicolasChauvet kwizart at rpmfusion.org
Fri Apr 3 21:45:49 CEST 2009


Author: kwizart

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

Modified Files:
	vlc.spec sources 
Added Files:
	vlc-0.9.9-fix_playlist.patch 
Log Message:
update to 0.9.9


vlc-0.9.9-fix_playlist.patch:

--- NEW FILE vlc-0.9.9-fix_playlist.patch ---
diff --git a/share/http/requests/playlist.xml b/share/http/requests/playlist.xml
index 5a3fb5c..cfeb4a8 100644
--- a/share/http/requests/playlist.xml
+++ b/share/http/requests/playlist.xml
@@ -35,9 +35,9 @@
   <vlc id="end" />
   <vlc id="if" param1="pl.type value 'Node' strcmp" />
     <vlc id="rpn" param1="1 +" />
-    <leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri xml_encode" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />" />
+    <leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri value xml_encode" />" name="<vlc id="value" param1="pl.name value xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />" />
   <vlc id="else" />
-    <node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
+    <node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name value xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
     <vlc id="if" param1="first_item value 0 ="/>
       <vlc id="rpn" param1="first_item 1 store" />
     <vlc id="end"/>
diff --git a/share/http/requests/status.xml b/share/http/requests/status.xml
index c180fa2..a5eeb43 100644
--- a/share/http/requests/status.xml
+++ b/share/http/requests/status.xml
@@ -117,9 +117,9 @@
   <repeat><vlc id="value" param1="'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_get" /></repeat>
   <information>
     <vlc id="foreach" param1="inf" param2="information" />
-      <category name="<vlc id="value" param1="inf.name xml_encode" />">
+      <category name="<vlc id="value" param1="inf.name value xml_encode" />">
         <vlc id="foreach" param1="subinf" param2="inf.info" />
-          <info name="<vlc id="value" param1="subinf.name xml_encode" />"><vlc id="value" param1="subinf.value xml_encode" /></info>
+          <info name="<vlc id="value" param1="subinf.name value xml_encode" />"><vlc id="value" param1="subinf.value value xml_encode" /></info>
         <vlc id="end" />
       </category>
     <vlc id="end" />
diff --git a/src/playlist/search.c b/src/playlist/search.c
index 720f481..1e6a566 100644
--- a/src/playlist/search.c
+++ b/src/playlist/search.c
@@ -171,7 +171,7 @@ static bool playlist_LiveSearchUpdateInternal( playlist_item_t *p_root,
         }
         else
         {
-            if( input_item_MetaMatch( p_item->p_input, vlc_meta_Title, psz_string ) ||
+            if( strcasestr( p_item->p_input->psz_name, psz_string ) || /* Soon to be replaced by vlc_meta_Title */
                 input_item_MetaMatch( p_item->p_input, vlc_meta_Album, psz_string ) ||
                 input_item_MetaMatch( p_item->p_input, vlc_meta_Artist, psz_string ) )
             {


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-9/vlc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vlc.spec	5 Dec 2008 01:58:29 -0000	1.14
+++ vlc.spec	3 Apr 2009 19:45:48 -0000	1.15
@@ -4,7 +4,8 @@
 %define with_internal_live555 		0
 %define live555_date	2008.07.25
 %define vlc_git				0
-%define vlc_date	20080915
+#define vlc_rc          -rc2
+%define vlc_date	20090210
 %define with_mozilla	 		1
 %define with_dc1394			0
 %define with_directfb			1
@@ -17,7 +18,7 @@
 %define _version %{version}-git
 %define release_tag   0.1.%{vlc_date}git
 %else
-Version:	0.9.8a
+Version:	0.9.9
 %define _version %{version}
 %define release_tag   1
 %endif
@@ -28,7 +29,7 @@
 %if %vlc_git
 Source0:        http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0024/vlc-snapshot-%{vlc_date}.tar.bz2
 %else
-Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}.tar.bz2
+Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}%{?vlc_rc}.tar.bz2
 %endif
 %if %with_internal_live555
 Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
@@ -39,6 +40,7 @@
 Patch3:         300_all_pic.patch
 Patch4:         310_all_mmx_pic.patch
 Patch5:         vlc-pulse0071.patch
+Patch6:         vlc-0.9.9-fix_playlist.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -53,7 +55,7 @@
 BuildRequires:	avahi-devel
 BuildRequires:  cdparanoia-devel
 BuildRequires:  dbus-devel
-%{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0}
+%{?_with_dirac: BuildRequires: dirac-devel >= 0.10.0 }
 %if %with_directfb
 BuildRequires:  directfb-devel
 %endif
@@ -68,6 +70,7 @@
 BuildRequires:	gsm-devel
 BuildRequires:	hal-devel
 BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:  libass-devel
 BuildRequires:  libavc1394-devel
 BuildRequires:	libcaca-devel
 BuildRequires:	libcddb-devel
@@ -85,7 +88,7 @@
 BuildRequires:	libmp4v2-devel
 BuildRequires:	libmpcdec-devel
 BuildRequires:  libnotify-devel
-BuildRequires:	librsvg2-devel >= 2.5.0
+BuildRequires:	librsvg2-devel >= 2.9.0
 BuildRequires:	libsysfs-devel
 BuildRequires:  libshout-devel
 BuildRequires:	libtar-devel
@@ -108,11 +111,12 @@
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:  libmusicbrainz-devel
-%{?_with_lua:BuildRequires: lua-devel}
+BuildRequires:  lua-devel
 BuildRequires:	mpeg2dec-devel >= 0.3.2
 BuildRequires:	ncurses-devel
 BuildRequires:  opencv-devel
 BuildRequires:	openslp-devel
+BuildRequires:  pcre-devel
 BuildRequires:  prelink
 BuildRequires:  qt4-devel
 BuildRequires:  schroedinger-devel
@@ -173,14 +177,14 @@
 %if %with_dc1394
 BuildRequires:  compat-libdc1394-devel
 BuildRequires:  compat-libraw1394-devel
-%else
-BuildRequires:  libraw1394-devel
+#else
+#BuildRequires:  libraw1394-devel
 %endif
 
 
 Requires: vlc-core = %{version}-%{release}
 %if 0%{?fedora} > 10
-Requires: dejavu-fonts-sans
+Requires: dejavu-sans-fonts
 %else
 Requires: dejavu-fonts
 %endif
@@ -201,7 +205,6 @@
 Non-default rpmbuild options:
 --with dirac:   Enable dirac codec support
 --with kate:    Enable kate codec support
---with lua:     Enable lua support
 
 
 %description devel
@@ -259,11 +262,13 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{_version}
+%setup -q -n %{name}-%{_version}%{?vlc_rc}
 %if %with_internal_live555
-%setup -q -D -T -a 2 -n %{name}-%{_version}
+%setup -q -D -T -a 2 -n %{name}-%{_version}%{?vlc_rc}
 %endif
 %patch0 -p1 -b .default_font
+%if %vlc_git
+%else
 %patch1 -p1 -b .pulse_default
 %patch2 -p1 -b .embedded
 #http://trac.videolan.org/vlc/ticket/1383
@@ -271,9 +276,13 @@
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 %patch4 -p1 -b .mmx_pic
 %patch5 -p1 -b .pulse0071
+%patch6 -p1 -b .pl
 
 chmod -x modules/gui/qt4/qt4*
+
 #./bootstrap
+%endif
+
 
 
 %build
@@ -295,7 +304,7 @@
 	--with-tuning=no			\
 	--enable-switcher			\
 	--enable-shout				\
-	%{?_with_lua:--enable-lua --enable-lua} \
+	--enable-lua                            \
 	--enable-live555 			\
 %if %with_internal_live555
 	--with-live555-tree=live		\
@@ -323,6 +332,8 @@
 	--enable-tarkin				\
 	--enable-theora				\
 	%{?_with_dirac:--enable-dirac}		\
+	--enable-libass				\
+	--enable-asademux			\
 	--enable-svg				\
 	--enable-snapshot			\
 %ifarch %{ix86} x86_64
@@ -372,7 +383,6 @@
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -440,12 +450,8 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/vlc.png
 %{_datadir}/vlc/skins2/
-%{_bindir}/cvlc
-%{_bindir}/nvlc
 %{_bindir}/qvlc
-%{_bindir}/rvlc
 %{_bindir}/svlc
-%{_bindir}/vlc-wrapper
 %{_libdir}/vlc/gui/libqt4_plugin.so
 %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
 %{_libdir}/vlc/access/libscreen_plugin.so
@@ -473,6 +479,10 @@
 %files core -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/vlc
+%{_bindir}/cvlc
+%{_bindir}/nvlc
+%{_bindir}/rvlc
+%{_bindir}/vlc-wrapper
 %exclude %{_datadir}/vlc/skins2
 %{_datadir}/vlc/
 %{_libdir}/*.so.*
@@ -507,7 +517,7 @@
 %exclude %{_libdir}/vlc/access/libdc1394_plugin.so
 %endif
 %{_libdir}/vlc/
-%{_mandir}/man1/vlc.1*
+%{_mandir}/man1/vlc*.1*
 
 %files nox
 %defattr(-,root,root,-)
@@ -541,6 +551,18 @@
 
 
 %changelog
+* Fri Apr  3 2009 kwizart < kwizart at gmail.com > - 0.9.9-1
+- Update to 0.9.9 final
+- backport playlist patch
+- Enable subtitles decoding
+
+* Tue Mar 16 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.5rc2
+- Use libxml2-static 2.6.2 from the Fedora GA repository
+
+* Fri Mar  6 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.4rc2
+- Update to 0.9.9-rc2
+- Add lua support by default
+
 * Fri Dec  5 2008 kwizart < kwizart at gmail.com > - 0.9.8a-1
 - Update to 0.9.8a
 Security update:


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Dec 2008 01:58:29 -0000	1.8
+++ sources	3 Apr 2009 19:45:48 -0000	1.9
@@ -1 +1 @@
-8ffa2ff763badd5de7592004d8d69a63  vlc-0.9.8a.tar.bz2
+b7c2a75194ad5c73979c3d880aebbe38  vlc-0.9.9.tar.bz2



More information about the rpmfusion-commits mailing list