Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv17969 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Log Message: - Rebase to Dharma beta3 (SVN r34731) - Disable VAAPI: crashes XBMC when playing back rtmp streams Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Sep 2010 19:57:22 -0000 1.4 +++ .cvsignore 15 Oct 2010 05:24:13 -0000 1.5 @@ -1 +1 @@ -xbmc-Dharma_beta2-patched.tar.xz +xbmc-Dharma_beta3-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Sep 2010 19:57:22 -0000 1.4 +++ sources 15 Oct 2010 05:24:13 -0000 1.5 @@ -1 +1 @@ -43d660351a00674fb12b2f358bfb1c05 xbmc-Dharma_beta2-patched.tar.xz +87ca5daf013a3d26abb03f2316897ae1 xbmc-Dharma_beta3-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xbmc-generate-tarball-xz.sh 15 Sep 2010 19:57:22 -0000 1.3 +++ xbmc-generate-tarball-xz.sh 15 Oct 2010 05:24:13 -0000 1.4 @@ -1,6 +1,6 @@ #!/bin/sh -MAJORVERSION=10.9 +MAJORVERSION=10.0 # pull from Dharma branch SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma @@ -9,17 +9,17 @@ #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk # use SVN version number passed from script, or otherwise use default -SVNVERSION=${1-33778} +SVNVERSION=${1-34731} # uncomment following if you want to always pull from tip of branch # SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2) #VERSION=$MAJORVERSION-$SVNVERSION -VERSION=Dharma_beta2 +VERSION=Dharma_beta3 # remove existing checkout rm -r xbmc-$VERSION -#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION +svn export -r $SVNVERSION $SVNURL xbmc-$VERSION # don't need to extra tarball, already expanded # comment out with tarball Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xbmc.spec 14 Oct 2010 21:58:04 -0000 1.16 +++ xbmc.spec 15 Oct 2010 05:24:13 -0000 1.17 @@ -1,12 +1,12 @@ -%global SVNVERSION 33778 -%global PRERELEASE Dharma_beta2 +%global SVNVERSION 34731 +%global PRERELEASE Dharma_beta3 # use below for SVN snapshot #global DIRVERSION %{version}-%{SVNVERSION} %global DIRVERSION %{PRERELEASE} Name: xbmc Version: 10.0 -Release: 0.18.%{PRERELEASE}%{?dist} +Release: 0.19.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -132,7 +132,8 @@ %if 0%{?fedora} >= 14 BuildRequires: librtmp-devel %endif -BuildRequires: libva-freeworld-devel +# VAAPI currently not working, comment-out +#BuildRequires: libva-freeworld-devel # need explicit requires for libcrystalhd functionality # as it is dynamically loaded @@ -217,6 +218,10 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Thu Oct 14 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.19.Dharma_beta3 +- Rebase to Dharma beta3 (SVN r34731) +- Disable VAAPI: crashes XBMC when playing back rtmp streams + * Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 10.0-0.18.Dharma_beta2 - Rebuilt for gcc bug