Update to Gotham alpha 9

5 files changed, 45 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 14f2e4d..12e39af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 /CVS
 /Makefile
 /sources
-/xbmc-13.0-Gotham_alpha8-patched.tar.xz
+/xbmc-13.0-Gotham_alpha9-patched.tar.xz
diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch
index d600972..065e93d 100644
--- a/xbmc-13.0-dvdread.patch
+++ b/xbmc-13.0-dvdread.patch
@@ -1,11 +1,15 @@
-commit 56647b999a332d78d9cfc758e8333ecc5c32f735
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Mon May 6 17:07:40 2013 -0600
+From 8a7a8d18094791bd57237b014cbd88fb033aab4d Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <ktdreyer@ktdreyer.com>
+Date: Sun, 24 Nov 2013 21:13:37 -0700
+Subject: [PATCH 1/2] Fedora: use external dvdread
 
-    Fedora: use external dvdread
-    
-    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-    (cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
+Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
+(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
+---
+ bootstrap.mk           |  5 -----
+ configure.in           | 22 +---------------------
+ lib/libdvd/Makefile.in | 20 +++++++-------------
+ 3 files changed, 8 insertions(+), 39 deletions(-)
 
 diff --git a/bootstrap.mk b/bootstrap.mk
 index 8bc4795..1fc31a4 100644
@@ -31,16 +35,16 @@ index 8bc4795..1fc31a4 100644
  	autoreconf -vif $(@D)
  	-@rm -rf $(@D)/autom4te.cache
 diff --git a/configure.in b/configure.in
-index 50bdf83..6136ecd 100644
+index 294e300..7a52036 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2734,29 +2734,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
+@@ -2825,29 +2825,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
      --with-pic
  ], [$SKIP_CONFIG_DVDCSS])
  
 -XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
 -  ./configure2 \
--    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \
+-    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
 -    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
 -    --host=$host_alias \
 -    --build=$build_alias \
@@ -58,7 +62,7 @@ index 50bdf83..6136ecd 100644
 -
  XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
    ./configure2 \
--    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \
+-    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
 -    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
 -    --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
 +    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC" \
@@ -132,3 +136,6 @@ index 69d2286..1f5eebb 100644
  libdvdnav/obj/libdvdnav.a: libdvdnav;
  libdvdnav: compile
  	$(MAKE) -C $@
+-- 
+1.8.3.1
+
diff --git a/xbmc-13.0-hdhomerun.patch b/xbmc-13.0-hdhomerun.patch
index 834a3f0..96fea7f 100644
--- a/xbmc-13.0-hdhomerun.patch
+++ b/xbmc-13.0-hdhomerun.patch
@@ -1,17 +1,21 @@
-commit 1e9e793eb2ceb55dad238e4a361b1cd32d5b39eb
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Fri Aug 24 19:34:47 2012 -0600
+From f79620d0bd702d4257e28e3083c893522a008c2d Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <ktdreyer@ktdreyer.com>
+Date: Fri, 24 Aug 2012 19:34:47 -0600
+Subject: [PATCH 2/2] Fedora: use external hdhomerun
 
-    Fedora: use external hdhomerun
-    
-    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-    (cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
+Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
+(cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
+---
+ Makefile.in                    |  5 +--
+ configure.in                   |  1 -
+ xbmc/filesystem/DllHDHomeRun.h | 78 ++++++++++++++++++++++++++++--------------
+ 3 files changed, 53 insertions(+), 31 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 3b21d50..323e1eb 100644
+index 618ca25..842fbc6 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -209,7 +209,6 @@ endif
+@@ -205,7 +205,6 @@ endif
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
@@ -19,7 +23,7 @@ index 3b21d50..323e1eb 100644
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
-@@ -405,8 +404,6 @@ libexif: dllloader
+@@ -411,8 +410,6 @@ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
@@ -28,7 +32,7 @@ index 3b21d50..323e1eb 100644
  papcodecs: dllloader dvdpcodecs
  	test -d system/players/paplayer || mkdir system/players/paplayer
  	$(MAKE) -C lib/xbadpcm
-@@ -435,7 +432,7 @@ endif
+@@ -441,7 +438,7 @@ endif
  
  codecs: papcodecs dvdpcodecs
  
@@ -38,10 +42,10 @@ index 3b21d50..323e1eb 100644
  externals: codecs libs visualizations screensavers libaddon pvraddons
  
 diff --git a/configure.in b/configure.in
-index 6136ecd..7f4dfe8 100644
+index 7a52036..717bb3b 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2436,7 +2436,6 @@ OUTPUT_FILES="Makefile \
+@@ -2518,7 +2518,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
@@ -144,3 +148,6 @@ index 150b00f..57936be 100644
 +  virtual void Unload() {}
  };
  
+-- 
+1.8.3.1
+
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 484f975..d99d767 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,7 +2,7 @@
 
 MAJORVERSION=13
 MINORVERSION=0
-PRERELEASE=Gotham_alpha8
+PRERELEASE=Gotham_alpha9
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
diff --git a/xbmc.spec b/xbmc.spec
index b91a6d2..fed0c31 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE Gotham_alpha8
+%global PRERELEASE Gotham_alpha9
 #%%global DIRVERSION %{version}
 # use the line below for pre-releases
 %global DIRVERSION %{version}-%{PRERELEASE}
@@ -6,7 +6,7 @@
 
 Name: xbmc
 Version: 13.0
-Release: 0.1.Gotham_alpha8%{?dist}
+Release: 0.2.Gotham_alpha9%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -331,6 +331,9 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Mon Nov 25 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 13.0-0.3.Gotham_alpha9
+- Update to Gotham alpha 9
+
 * Wed Oct 16 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 13.0-0.1.Gotham_alpha8
 - Update to Gotham alpha 8
 - Add -devel subpackage