Update to Gotham alpha 8

- Add -devel subpackage
- Drop bundled PVR addon (we'll package this separately)

10 files changed, 54 insertions, 437 deletions

diff --git a/.gitignore b/.gitignore
index 055dd86..14f2e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,4 @@
 /CVS
 /Makefile
 /sources
-/xbmc-9.11-patched.tar.xz
-/xbmc-12.0-Frodo_alpha6-patched.tar.xz
-/xbmc-12.0-Frodo_alpha7-patched.tar.xz
-/xbmc-pvr-addons-590f862-patched.tar.xz
-/xbmc-12.2-patched.tar.xz
+/xbmc-13.0-Gotham_alpha8-patched.tar.xz
diff --git a/TODO b/TODO
index 151eb19..ff22774 100644
--- a/TODO
+++ b/TODO
@@ -1,25 +1,9 @@
-* Watch the addons and possibly split them out.
-
-  No specific action here presently. We do need to watch and see if it
-  would be beneficial to split out xbmc-pvr-addons into a separate
-  package.
-
 * Merge libdvdread libhomehdrun patches upstream.
 
   The patches must be rewritten to use the external, if found, and
   drop back to bundled versions if not before they would be allowed
   upstream.
 
-* Build with libcec on F18 and above
-
-  libcec is in Fedora 18. Build xbmc with it in order to support remote
-  controlling the Raspberry Pi over HDMI.
-
-* Cleanup: remove commented sections
-
-  Remove the obsolete section about tsp's addons, and remove any commented
-  patches.
-
 * Package the manpages in docs/manpages as per package guidelines.
 
 * Unbundle any other deps that can be easily unbundled.
diff --git a/xbmc-12.0-pvraddons-with-dependencies.patch b/xbmc-12.0-pvraddons-with-dependencies.patch
deleted file mode 100644
index ff3e80e..0000000
--- a/xbmc-12.0-pvraddons-with-dependencies.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3eb985a5b256958370d8d5cb4864e31a0458b05f Mon Sep 17 00:00:00 2001
-From: wsnipex <wsnipex@a1.net>
-Date: Sun, 4 Nov 2012 14:05:52 +0100
-Subject: [PATCH] configure: add --enable-pvraddons-with-dependencies switch
- for intree building of PVR Addons
-
----
- configure.in |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 7889dde..fd6cea0 100644
---- a/configure.in
-+++ b/configure.in
-@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg],
-   [use_external_ffmpeg=$use_external_libraries])
- 
- ### End of external library options
-+### PVR addons specific
-+AC_ARG_ENABLE([pvraddons-with-dependencies],
-+  [AS_HELP_STRING([--enable-pvraddons-with-dependencies],
-+  [enable build of pvr addons with dependencies (default is no) 'Linux only'])],
-+  [use_pvraddons_with_deps=$enableval],
-+  [use_pvraddons_with_deps=no])
-+
-+### End PVR addons specific
- 
- if test "x$host_vendor" != "xapple"; then
-   DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT"
-@@ -2764,12 +2772,16 @@ XB_CONFIG_MODULE([pvr-addons], [
-    if test "$USE_EXTERNAL_FFMPEG" = 1; then
-       PVR_EXT_FFMPEG="--enable-external-ffmpeg"
-    fi
-+   if test "$use_pvraddons_with_deps" = "yes"; then
-+      ADDONS_WITH_DEPS="--enable-addons-with-dependencies"
-+   fi
-   ./configure \
-     --prefix="${prefix}" \
-     --host=$host_alias \
-     --build=$build_alias \
-     --target=$target_alias \
-     $PVR_EXT_FFMPEG \
-+    $ADDONS_WITH_DEPS \
-     CC="$CC" \
-     CXX="$CXX" \
-     CFLAGS="$CFLAGS" \
--- 
-1.7.10
-
diff --git a/xbmc-12.2-dvdread.patch b/xbmc-12.2-dvdread.patch
deleted file mode 100644
index 84bb7e8..0000000
--- a/xbmc-12.2-dvdread.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-commit 9f9845af842a376d5bdf70742785e7727695fd03
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Mon May 6 17:07:40 2013 -0600
-
-    Fedora: use external dvdread
-    
-    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-
-diff --git a/bootstrap.mk b/bootstrap.mk
-index 8bc4795..1fc31a4 100644
---- a/bootstrap.mk
-+++ b/bootstrap.mk
-@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
- DVD_CSS=lib/libdvd/libdvdcss/configure
- endif
--BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
- 
- ifneq ($(wildcard pvr-addons/Makefile.am),)
-@@ -18,10 +17,6 @@ endif
- BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
- all: $(BOOTSTRAP_TARGETS)
- 
--#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
--lib/libdvd/libdvdread/configure: $(DVD_CSS)
--lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
--
- %: %.ac
- 	autoreconf -vif $(@D)
- 	-@rm -rf $(@D)/autom4te.cache
-diff --git a/configure.in b/configure.in
-index e98cc95..e922043 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2616,28 +2616,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" \
--    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--    --host=$host_alias \
--    --build=$build_alias \
--    --target=$target_alias \      
--    --enable-static \
--    --disable-shared \
--    --disable-strip \
--    --disable-opts \
--    --cc="$CC" &&
--  $MAKE dvdread-config &&
--  mkdir -p `pwd`/../includes/dvdread
--  cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
--], [0])
--
- XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
-   ./configure2 \
--    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \
--    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
--    --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
-+    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC" \
-     --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
-     --host=$host_alias \
-     --build=$build_alias \
-diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
-index 69d2286..1f5eebb 100644
---- a/lib/libdvd/Makefile.in
-+++ b/lib/libdvd/Makefile.in
-@@ -5,8 +5,7 @@ CXX=@CXX@
- 
- SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
- SOS= libdvdnav-$(ARCH).so
--DIRS=	libdvdread \
--	libdvdnav
-+DIRS=	libdvdnav
- 
- WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
- WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
-@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al
- ifeq ($(findstring osx,$(ARCH)),osx)
- LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
- else
--LDFLAGS += -shared -fPIC -rdynamic
-+LDFLAGS += -shared -fPIC -rdynamic -ldvdread
- endif
- 
- ifeq ($(ARCH), powerpc-osx)
-@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS))
- 
- DISTCLEAN_FILES=includes/dvdread/*.h \
- 		includes/dvdcss/*.h \
--		libdvdnav/config.h \
--		libdvdread/config.h
-+		libdvdnav/config.h
- 
- .PHONY: $(DIRS) compile
- 
-@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so:  $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
- 	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
- 		$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
- 
--$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
-+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
- 	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
--		$(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
-+		$(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
- 
- else
- 
-@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- 		libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
--$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
--	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
-+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
- 		-Wl,--unresolved-symbols=ignore-all \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
-@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
- libdvdcss: compile
- 	$(MAKE) -C $@
- 
--libdvdread/obj/libdvdread.a: libdvdread;
--libdvdread: compile
--	$(MAKE) -C $@
--
- libdvdnav/obj/libdvdnav.a: libdvdnav;
- libdvdnav: compile
- 	$(MAKE) -C $@
diff --git a/xbmc-12.2-hdhomerun.patch b/xbmc-12.2-hdhomerun.patch
deleted file mode 100644
index 73cad40..0000000
--- a/xbmc-12.2-hdhomerun.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-commit ef5c269992b32d67de7547e9f530b6c971381f45
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Fri Aug 24 19:34:47 2012 -0600
-
-    Fedora: use external hdhomerun
-    
-    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-
-diff --git a/Makefile.in b/Makefile.in
-index 39dc6f9..79877b4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -179,7 +179,6 @@ endif
- LIB_DIRS=\
- 	lib/cximage-6.0 \
- 	lib/libexif \
--	lib/libhdhomerun \
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
-@@ -352,8 +351,6 @@ libexif: dllloader
- 	$(MAKE) -C lib/libexif
- cmyth: dllloader
- 	$(MAKE) -C lib/cmyth
--libhdhomerun: dllloader
--	$(MAKE) -C lib/libhdhomerun
- papcodecs: dllloader dvdpcodecs
- 	test -d system/players/paplayer || mkdir system/players/paplayer
- 	$(MAKE) -C lib/xbadpcm
-@@ -382,7 +379,7 @@ endif
- 
- codecs: papcodecs dvdpcodecs
- 
--libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
-+libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
- 
- externals: codecs libs visualizations screensavers libaddon pvraddons
- 
-diff --git a/configure.in b/configure.in
-index e922043..b61f0dd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2331,7 +2331,6 @@ OUTPUT_FILES="Makefile \
-     lib/libexif/Makefile \
-     lib/libXDAAP/Makefile \
-     lib/cmyth/Makefile \
--    lib/libhdhomerun/Makefile \
-     lib/libsquish/Makefile \
-     lib/cximage-6.0/Makefile \
-     lib/addons/script.module.pil/Makefile \
-diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
-index 1667fde..48bdae3 100644
---- a/xbmc/filesystem/DllHDHomeRun.h
-+++ b/xbmc/filesystem/DllHDHomeRun.h
-@@ -20,7 +20,7 @@
-  */
- 
- #include "DynamicDll.h"
--#include "lib/libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
- 
- class DllHdHomeRunInterface
- {
-@@ -41,30 +41,56 @@ public:
- 
- class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
- {
--  DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
--  DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
--  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, 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))
--  DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
--  DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
--  BEGIN_METHOD_RESOLVE()
--    RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
--  END_METHOD_RESOLVE()
-+public:
-+  virtual ~DllHdHomeRun () {};
-+
-+  virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
-+      { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
-+
-+  virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
-+      { return ::hdhomerun_device_create_from_str (p1, p2); }
-+
-+  virtual void device_destroy (struct hdhomerun_device_t* p1)
-+      { ::hdhomerun_device_destroy (p1); }
-+
-+  virtual int device_stream_start (struct hdhomerun_device_t* p1)
-+      { return ::hdhomerun_device_stream_start (p1); }
-+
-+
-+  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
-+      { 
-+        uint8_t *retval;
-+
-+        size_t tmp = *p3;
-+        retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
-+        *p3 = tmp;
-+
-+        return retval;
-+      }
-+
-+  virtual void device_stream_stop (struct hdhomerun_device_t* p1)
-+      { ::hdhomerun_device_stream_stop (p1); }
-+
-+  virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
-+
-+  virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_program (p1, p2); }
-+
-+
-+  virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
-+
-+
-+  virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
-+      { ::hdhomerun_device_set_tuner (p1, p2); }
-+
-+  virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
-+      { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
-+
-+  // DLL faking.
-+  virtual bool ResolveExports() { return true; }
-+  virtual bool Load() { return true; }
-+  virtual void Unload() {}
- };
- 
diff --git a/xbmc-master-dvdread.patch b/xbmc-13.0-dvdread.patch
index cfd1821..d600972 100644
--- a/xbmc-master-dvdread.patch
+++ b/xbmc-13.0-dvdread.patch
@@ -1,4 +1,4 @@
-commit 77d7f661bc63ed217065e5c37fbb92f6d2e099fd
+commit 56647b999a332d78d9cfc758e8333ecc5c32f735
 Author: Ken Dreyer <ktdreyer@ktdreyer.com>
 Date:   Mon May 6 17:07:40 2013 -0600
 
@@ -31,10 +31,10 @@ index 8bc4795..1fc31a4 100644
  	autoreconf -vif $(@D)
  	-@rm -rf $(@D)/autom4te.cache
 diff --git a/configure.in b/configure.in
-index d89353c..04dac86 100644
+index 50bdf83..6136ecd 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2686,29 +2686,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
+@@ -2734,29 +2734,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
      --with-pic
  ], [$SKIP_CONFIG_DVDCSS])
  
diff --git a/xbmc-master-hdhomerun.patch b/xbmc-13.0-hdhomerun.patch
index a5a797c..834a3f0 100644
--- a/xbmc-master-hdhomerun.patch
+++ b/xbmc-13.0-hdhomerun.patch
@@ -1,4 +1,4 @@
-commit 2f7bbc5de48fbd105fabbd79aae270cbcb3ade03
+commit 1e9e793eb2ceb55dad238e4a361b1cd32d5b39eb
 Author: Ken Dreyer <ktdreyer@ktdreyer.com>
 Date:   Fri Aug 24 19:34:47 2012 -0600
 
@@ -8,10 +8,10 @@ Date:   Fri Aug 24 19:34:47 2012 -0600
     (cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
 
 diff --git a/Makefile.in b/Makefile.in
-index 3cbe1a2..5d6aaf7 100644
+index 3b21d50..323e1eb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -186,7 +186,6 @@ endif
+@@ -209,7 +209,6 @@ endif
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
@@ -19,7 +19,7 @@ index 3cbe1a2..5d6aaf7 100644
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
-@@ -363,8 +362,6 @@ libexif: dllloader
+@@ -405,8 +404,6 @@ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
@@ -28,7 +28,7 @@ index 3cbe1a2..5d6aaf7 100644
  papcodecs: dllloader dvdpcodecs
  	test -d system/players/paplayer || mkdir system/players/paplayer
  	$(MAKE) -C lib/xbadpcm
-@@ -393,7 +390,7 @@ endif
+@@ -435,7 +432,7 @@ endif
  
  codecs: papcodecs dvdpcodecs
  
@@ -38,10 +38,10 @@ index 3cbe1a2..5d6aaf7 100644
  externals: codecs libs visualizations screensavers libaddon pvraddons
  
 diff --git a/configure.in b/configure.in
-index 04dac86..38d7698 100644
+index 6136ecd..7f4dfe8 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2399,7 +2399,6 @@ OUTPUT_FILES="Makefile \
+@@ -2436,7 +2436,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
@@ -50,7 +50,7 @@ index 04dac86..38d7698 100644
      lib/cximage-6.0/Makefile \
      lib/libUPnP/Makefile \
 diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
-index e49ff31..41b4591 100644
+index 150b00f..57936be 100644
 --- a/xbmc/filesystem/DllHDHomeRun.h
 +++ b/xbmc/filesystem/DllHDHomeRun.h
 @@ -20,7 +20,7 @@
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 60fff3e..484f975 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-MAJORVERSION=12
-MINORVERSION=2
-#PRERELEASE=Frodo_rc3
+MAJORVERSION=13
+MINORVERSION=0
+PRERELEASE=Gotham_alpha8
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
-GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Frodo
-#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Frodo
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
 
 # download zipball
 if [[ ! -f xbmc-$VERSION.zip ]]; then
@@ -27,7 +27,7 @@ pushd xbmc-$VERSION
 # grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream
 # seems to require files within that subdirectory <sigh>, filed
 # http://trac.xbmc.org/ticket/12370
-for i in  cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 ffmpeg
+for i in  cximage-6.0/zlib libhdhomerun libmpeg2 ffmpeg
 do
     rm -r lib/$i
 done
@@ -40,26 +40,26 @@ done
 
 
 # remove DVD stuff we can't ship, or is already in external libraries
-for i in libdvdcss libdvdread includes 
+for i in libdvdcss libdvdread includes
 do
     rm -r lib/libdvd/$i
 done
 
-# remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
-find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) -print0 | xargs -0 rm -f
+# remove all prebuilt binaries (e.g., Win32 DLLs)
+find \( -type f -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.obj' -o -name '*.exe' \) -print0 | xargs -0 rm -f
 
 # remove all other packages that should be system-wide
-# except for libass, cpluff, jsoncpp (need to figure out how to
+# except for libass, cpluff (need to figure out how to
 # remove these too)
 # xbmc-dll-symbols seems to be XBMC-specific
-for i in enca freetype libbluray liblame libmicrohttpd libmodplug librtmp win32
+for i in enca freetype libbluray libmicrohttpd libmodplug librtmp win32
 do
     rm -r lib/$i
 done
 
-# TODO/FIXME: remove tools/XBMCLive/ and other things under tools/ 
+# TODO/FIXME: remove other unnecessary things under tools/
 # also remove anything to do with win32
-for i in arm darwin win32buildtools 
+for i in android darwin win32buildtools
 do
     rm -r tools/$i
 done
diff --git a/xbmc-pvr-addons-generate-tarball-xz.sh b/xbmc-pvr-addons-generate-tarball-xz.sh
deleted file mode 100755
index 568659a..0000000
--- a/xbmc-pvr-addons-generate-tarball-xz.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# The xbmc-pvr-addon software does not yet use version numbers, so we'll
-# just use git hashes for identifiers.
-
-# Upstream xbmc also hardcodes a Git hash for OSes that bundle
-# xbmc-pvr-addons.  Let's try using the same hash that upstream uses. It
-# can be found in the source tree like so:
-#   grep ^VERSION tools/darwin/depends/xbmc-pvr-addons/Makefile
-COMMIT=590f862065d0f07d399fe4443a72dc37394becb4
-GITHASH=${COMMIT:0:7}
-GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip
-
-# download zipball
-if [[ ! -f xbmc-pvr-addons-$GITHASH.zip ]]; then
-    curl -o xbmc-pvr-addons-$GITHASH.zip -L $GITHUBURL
-fi
-
-# extract zipball
-find . -maxdepth 1 -name "xbmc-pvr-addons-$GITHASH*" -type d -exec rm -r '{}' \;
-unzip xbmc-pvr-addons-$GITHASH.zip
-
-# Shorten GitHub's auto-generated top-level directory.
-if [[ -d pvr-addons ]]; then
-       rm -r pvr-addons
-fi
-find . -maxdepth 1 -name "xbmc-pvr-addons-$GITHASH*" -type d -exec mv '{}' pvr-addons \;
-
-pushd pvr-addons
-
-# remove Windows stuff
-rm -r project
-
-popd
-
-# repack
-tar -cJvf xbmc-pvr-addons-$GITHASH-patched.tar.xz pvr-addons
-
-rm -r pvr-addons
diff --git a/xbmc.spec b/xbmc.spec
index f8beabc..b91a6d2 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,42 +1,29 @@
-#global PRERELEASE Frodo_rc3
-%global DIRVERSION %{version}
+%global PRERELEASE Gotham_alpha8
+#%%global DIRVERSION %{version}
 # use the line below for pre-releases
-#global DIRVERSION %{version}-%{PRERELEASE}
+%global DIRVERSION %{version}-%{PRERELEASE}
 %global _hardened_build 1
 
 Name: xbmc
-Version: 12.2
-Release: 5%{?dist}
+Version: 13.0
+Release: 0.1.Gotham_alpha8%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
 # xbmc contains code that we cannot ship, as well as redundant private
 # copies of upstream libraries that we already distribute.  Therefore
 # we use this script to remove the code before shipping it.
-# Download the upstream tarball from:
-# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# and invoke this script while in the directory where the tarball is located:
-# ./xbmc-generate-tarball-xz.sh <version>
-# where <version> is the particular version being used
+# Invoke this script while in the directory where the tarball is located:
+# ./xbmc-generate-tarball-xz.sh
 Source1: xbmc-generate-tarball-xz.sh
 
-# xbmc pvr addons are shipped as a separate git repo.
-Source2: xbmc-pvr-addons-590f862-patched.tar.xz
-Source3: xbmc-pvr-addons-generate-tarball-xz.sh
-
-# https://github.com/xbmc/xbmc/pull/1725.patch
-# We need this as long as we build addons together with the main XBMC
-# software. (This will probably never get merged upstream; see pull
-# request for details.)
-Patch1: xbmc-12.0-pvraddons-with-dependencies.patch
-
 # filed ticket, but patch still needs work
 # http://trac.xbmc.org/ticket/9658
-Patch2: xbmc-12.2-dvdread.patch
+Patch1: xbmc-13.0-dvdread.patch
 
 # need to file trac ticket, this patch just forces external hdhomerun
 # functionality, needs to be able fallback internal version
-Patch3: xbmc-12.2-hdhomerun.patch
+Patch2: xbmc-13.0-hdhomerun.patch
 
 
 # Optional deps (not in EPEL)
@@ -202,6 +189,17 @@ entertainment hub.  XBMC can play a spectrum of of multimedia formats,
 and featuring playlist, audio visualizations, slideshow, and weather
 forecast functions, together third-party plugins.
 
+%package devel
+Summary: Development files needed to compile C programs against xbmc
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+
+XBMC media center is a free cross-platform media-player jukebox and
+entertainment hub. If you want to develop programs which use xbmc's
+libraries, you need to install this package.
+
 #%%package eventclients
 #%Summary: Media center event client remotes
 
@@ -219,11 +217,10 @@ forecast functions, together third-party plugins.
 
 %prep
 
-%setup -q -a 2 -n %{name}-%{DIRVERSION}
+%setup -q -n %{name}-%{DIRVERSION}
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %if 0%{?_with_hdhomerun}
 %else
@@ -252,7 +249,6 @@ chmod +x bootstrap
 --enable-goom \
 --enable-external-libraries \
 --enable-pulse \
---enable-pvraddons-with-dependencies \
 %if 0%{?_with_libcec}
 --enable-libcec \
 %endif
@@ -315,6 +311,9 @@ fi
 %{_datadir}/applications/xbmc.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 
+%files devel
+%{_includedir}/xbmc
+
 #%%files eventclients
 #%%defattr(-,root,root)
 #%%python_sitelib/xbmc
@@ -332,6 +331,11 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Wed Oct 16 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 13.0-0.1.Gotham_alpha8
+- Update to Gotham alpha 8
+- Add -devel subpackage
+- Drop bundled PVR addon (we'll package this separately)
+
 * Thu Jul 04 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.2-5
 - Explicitly Require libmad (necessary for the upcoming xbmc 13)