diff options
| -rw-r--r-- | xbmc-10-hdhomerun.patch | 8 | ||||
| -rwxr-xr-x | xbmc-generate-tarball-xz.sh | 4 | ||||
| -rw-r--r-- | xbmc.spec | 9 |
3 files changed, 12 insertions, 9 deletions
diff --git a/xbmc-10-hdhomerun.patch b/xbmc-10-hdhomerun.patch index 4ca61d7..6fc08aa 100644 --- a/xbmc-10-hdhomerun.patch +++ b/xbmc-10-hdhomerun.patch @@ -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; + diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index f8eb8c5..0b41fef 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -9,12 +9,12 @@ SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma #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 @@ -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 @@ rm -rf $RPM_BUILD_ROOT %{_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) |