Author: kwizart Update of /cvs/free/rpms/vlc/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv31164 Modified Files: vlc.spec sources .cvsignore Added Files: vlc-0.9.9-fix_playlist.patch Log Message: Update to 0.9.9 final 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-10/vlc.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- vlc.spec 17 Mar 2009 11:31:20 -0000 1.18 +++ vlc.spec 3 Apr 2009 19:32:03 -0000 1.19 @@ -4,7 +4,7 @@ %define with_internal_live555 0 %define live555_date 2008.07.25 %define vlc_git 0 -%define vlc_rc -rc2 +#define vlc_rc -rc2 %define vlc_date 20090210 %define with_mozilla 1 %define with_dc1394 0 @@ -20,7 +20,7 @@ %else Version: 0.9.9 %define _version %{version} -%define release_tag 0.5rc2 +%define release_tag 1 %endif Release: %{release_tag}%{?dist} License: GPLv2+ @@ -40,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 @@ -69,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 @@ -97,11 +99,7 @@ BuildRequires: libv4l-devel %endif BuildRequires: libvorbis-devel -%if 0%{?fedora} < 11 -BuildRequires: libxml2 < 2.7.3 -BuildRequires: libxml2-devel < 2.7.3 -BuildRequires: libxml2-static < 2.7.3 -%endif +BuildRequires: libxml2-devel BuildRequires: lirc-devel %if %with_internal_live555 BuildConflicts: live-devel @@ -118,6 +116,7 @@ BuildRequires: ncurses-devel BuildRequires: opencv-devel BuildRequires: openslp-devel +BuildRequires: pcre-devel BuildRequires: prelink BuildRequires: qt4-devel BuildRequires: schroedinger-devel @@ -277,18 +276,15 @@ 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 -%if 0%{?fedora} > 10 -%else -cp -p %{_bindir}/xml2-config . -sed -i.libxml2_static -e 's|-lxml2|-static -lxml2 -shared -L%{_libdir} -lc |g' xml2-config configure.ac configure +#./bootstrap %endif + %build %if %with_internal_live555 # Then bundled live555 - not needed @@ -336,6 +332,8 @@ --enable-tarkin \ --enable-theora \ %{?_with_dirac:--enable-dirac} \ + --enable-libass \ + --enable-asademux \ --enable-svg \ --enable-snapshot \ %ifarch %{ix86} x86_64 @@ -554,6 +552,11 @@ %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 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Mar 2009 18:23:51 -0000 1.9 +++ sources 3 Apr 2009 19:32:03 -0000 1.10 @@ -1 +1 @@ -d9e43e626c183052a6d44954eb366f08 vlc-0.9.9-rc2.tar.bz2 +b7c2a75194ad5c73979c3d880aebbe38 vlc-0.9.9.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Nov 2008 15:37:28 -0000 1.7 +++ .cvsignore 3 Apr 2009 19:32:03 -0000 1.8 @@ -1 +1 @@ -vlc-0.9.6.tar.bz2 +vlc-0.9.9.tar.bz2