Update to Gotham alpha 11

5 files changed, 21 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 12e39af..a492faa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 /CVS
 /Makefile
 /sources
-/xbmc-13.0-Gotham_alpha9-patched.tar.xz
+/xbmc-13.0-Gotham_alpha11-patched.tar.xz
diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch
index 065e93d..d4dfeb9 100644
--- a/xbmc-13.0-dvdread.patch
+++ b/xbmc-13.0-dvdread.patch
@@ -1,6 +1,6 @@
-From 8a7a8d18094791bd57237b014cbd88fb033aab4d Mon Sep 17 00:00:00 2001
+From 28f6184a53d5b4bac2ed45636c27fd7b54c7c3fc Mon Sep 17 00:00:00 2001
 From: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date: Sun, 24 Nov 2013 21:13:37 -0700
+Date: Mon, 6 May 2013 17:07:40 -0600
 Subject: [PATCH 1/2] Fedora: use external dvdread
 
 Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
@@ -35,10 +35,10 @@ index 8bc4795..1fc31a4 100644
  	autoreconf -vif $(@D)
  	-@rm -rf $(@D)/autom4te.cache
 diff --git a/configure.in b/configure.in
-index 294e300..7a52036 100644
+index 09f11cd..4182c66 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2825,29 +2825,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
+@@ -2836,29 +2836,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
      --with-pic
  ], [$SKIP_CONFIG_DVDCSS])
  
diff --git a/xbmc-13.0-hdhomerun.patch b/xbmc-13.0-hdhomerun.patch
index 96fea7f..a8b126a 100644
--- a/xbmc-13.0-hdhomerun.patch
+++ b/xbmc-13.0-hdhomerun.patch
@@ -1,4 +1,4 @@
-From f79620d0bd702d4257e28e3083c893522a008c2d Mon Sep 17 00:00:00 2001
+From ca26da928991f0e3e48018255abc79c86fb46caf 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
@@ -12,10 +12,10 @@ Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
  3 files changed, 53 insertions(+), 31 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 618ca25..842fbc6 100644
+index a14b3c5..f389b51 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -205,7 +205,6 @@ endif
+@@ -211,7 +211,6 @@ endif
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
@@ -23,7 +23,7 @@ index 618ca25..842fbc6 100644
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
-@@ -411,8 +410,6 @@ libexif: dllloader
+@@ -428,8 +427,6 @@ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
@@ -32,9 +32,9 @@ index 618ca25..842fbc6 100644
  papcodecs: dllloader dvdpcodecs
  	test -d system/players/paplayer || mkdir system/players/paplayer
  	$(MAKE) -C lib/xbadpcm
-@@ -441,7 +438,7 @@ endif
+@@ -458,7 +455,7 @@ endif
  
- codecs: papcodecs dvdpcodecs
+ codecs: papcodecs dvdpcodecs dvdpextcodecs
  
 -libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
 +libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
@@ -42,10 +42,10 @@ index 618ca25..842fbc6 100644
  externals: codecs libs visualizations screensavers libaddon pvraddons
  
 diff --git a/configure.in b/configure.in
-index 7a52036..717bb3b 100644
+index 4182c66..b78085a 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2518,7 +2518,6 @@ OUTPUT_FILES="Makefile \
+@@ -2522,7 +2522,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index d99d767..a1706bc 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,7 +2,7 @@
 
 MAJORVERSION=13
 MINORVERSION=0
-PRERELEASE=Gotham_alpha9
+PRERELEASE=Gotham_alpha11
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
diff --git a/xbmc.spec b/xbmc.spec
index fed0c31..b771b78 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE Gotham_alpha9
+%global PRERELEASE Gotham_alpha11
 #%%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.2.Gotham_alpha9%{?dist}
+Release: 0.3.Gotham_alpha11%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -149,6 +149,8 @@ BuildRequires: libcap-devel
 %if 0%{?_with_libcec}
 BuildRequires: libcec-devel
 %endif
+BuildRequires: libxml-devel
+BuildRequires: libxslt-devel
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
@@ -331,6 +333,9 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Mon Jan 27 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 13.0-0.5.Gotham_alpha11
+- Update to Gotham alpha 11
+
 * Mon Nov 25 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 13.0-0.3.Gotham_alpha9
 - Update to Gotham alpha 9