rpms/xbmc/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xbmc-10-hdhomerun.patch, 1.1, 1.2 xbmc-generate-tarball-xz.sh, 1.2, 1.3 xbmc.spec, 1.11, 1.12

[Alex Lancaster]

Author: alexlan

Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12987

Modified Files:
	.cvsignore sources xbmc-10-hdhomerun.patch 
	xbmc-generate-tarball-xz.sh xbmc.spec 
Log Message:
Rebase to Dharma beta 2 (SVN r33778)



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Sep 2010 03:17:55 -0000	1.3
+++ .cvsignore	15 Sep 2010 19:57:22 -0000	1.4
@@ -1 +1 @@
-xbmc-Dharma_beta1-patched.tar.xz
+xbmc-Dharma_beta2-patched.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Sep 2010 03:17:55 -0000	1.3
+++ sources	15 Sep 2010 19:57:22 -0000	1.4
@@ -1 +1 @@
-1e987ff1c5baac9d79cece45bf7c2699  xbmc-Dharma_beta1-patched.tar.xz
+43d660351a00674fb12b2f358bfb1c05  xbmc-Dharma_beta2-patched.tar.xz

xbmc-10-hdhomerun.patch:
 Makefile.in                 |    7 +--
 configure.in                |    1 
 xbmc/FileSystem/HDHomeRun.h |   78 +++++++++++++++++++++++++++++---------------
 3 files changed, 54 insertions(+), 32 deletions(-)

Index: xbmc-10-hdhomerun.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-10-hdhomerun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc-10-hdhomerun.patch	2 Sep 2010 03:17:55 -0000	1.1
+++ xbmc-10-hdhomerun.patch	15 Sep 2010 19:57:22 -0000	1.2
@@ -29,8 +29,8 @@
  endif
  externals: codecs libs python visualizations screensavers
  
---- xbmc-10/xbmc/FileSystem/HDHomeRun.h.orig	2010-01-31 20:58:58.000000000 -0500
-+++ xbmc-10/xbmc/FileSystem/HDHomeRun.h	2010-07-19 02:17:38.913394783 -0400
+--- xbmc-10/xbmc/FileSystem/HDHomeRun.h.orig	2010-09-14 01:00:12.000000000 -0400
++++ xbmc-10/xbmc/FileSystem/HDHomeRun.h	2010-09-14 19:30:28.290178461 -0400
 @@ -22,7 +22,7 @@
  
  #include "IDirectory.h"
@@ -49,7 +49,7 @@
 -  DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
 -  DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
 -  DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3))
+-  DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
 -  DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
 -  DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
 -  DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
@@ -85,7 +85,7 @@
 +      { return ::hdhomerun_device_stream_start (p1); }
 +
 +
-+  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3)
++  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
 +      { 
 +        uint8_t *retval;
 +


Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc-generate-tarball-xz.sh	2 Sep 2010 03:17:55 -0000	1.2
+++ xbmc-generate-tarball-xz.sh	15 Sep 2010 19:57:22 -0000	1.3
@@ -9,12 +9,12 @@
 #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
 
 # use SVN version number passed from script, or otherwise use default
-SVNVERSION=${1-33324}
+SVNVERSION=${1-33778}
 # 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_beta1
+VERSION=Dharma_beta2
 
 # remove existing checkout
 rm -r xbmc-$VERSION


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xbmc.spec	15 Sep 2010 00:36:39 -0000	1.11
+++ xbmc.spec	15 Sep 2010 19:57:22 -0000	1.12
@@ -1,12 +1,12 @@
-%global SVNVERSION 33324
-%global PRERELEASE Dharma_beta1
+%global SVNVERSION 33778
+%global PRERELEASE Dharma_beta2
 # use below for SVN snapshot
 #global DIRVERSION %{version}-%{SVNVERSION}
 %global DIRVERSION %{PRERELEASE}
 
 Name: xbmc
 Version: 10.0
-Release: 0.13.%{PRERELEASE}%{?dist}
+Release: 0.14.%{PRERELEASE}%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -213,6 +213,9 @@
 %{_datadir}/icons/hicolor/*/*/*.png
 
 %changelog
+* Tue Sep 14 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.14.Dharma_beta2
+- Rebase to Dharma beta 2 (SVN r33778)
+
 * Tue Sep 14 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.13.Dharma_beta1
 - Disable SNES codec (Nintendo sound files) on f14 as nasm >=2.09 has
   trouble compiling with that version on f14 (rhbz#633646)