Update to Frodo alpha 6

Use "12.0" as version, rather than "12.8"
Drop desktop patch (now in Frodo alpha6)
Add BR for taglib-devel >= 1.8 (libid3tag is being phased out)
Rebase patches to 12.0/Frodo where necessary

6 files changed, 87 insertions, 60 deletions

diff --git a/xbmc-11.0-bootstrap.patch b/xbmc-11.0-bootstrap.patch
deleted file mode 100644
index c80aa2e..0000000
--- a/xbmc-11.0-bootstrap.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bootstrap.orig	2011-12-22 22:12:21.000000000 -0500
-+++ bootstrap	2011-12-27 17:00:43.789624393 -0500
-@@ -11,6 +11,7 @@
- # order matters with libdvd and friends
- [ -d lib/libdvd/libdvdcss ] && \
-   autoreconf -vif lib/libdvd/libdvdcss
-+[ -d lib/libdvd/libdvdread ] && \
- autoreconf -vif lib/libdvd/libdvdread
- autoreconf -vif lib/libdvd/libdvdnav
- 
diff --git a/xbmc-12.0-bootstrap.patch b/xbmc-12.0-bootstrap.patch
new file mode 100644
index 0000000..00aa1d4
--- /dev/null
+++ b/xbmc-12.0-bootstrap.patch
@@ -0,0 +1,12 @@
+--- bootstrap.orig	2012-10-04 15:35:08.580601064 -0400
++++ bootstrap	2012-10-04 15:35:38.067597210 -0400
+@@ -11,7 +11,8 @@
+ # order matters with libdvd and friends
+ [ -d lib/libdvd/libdvdcss ] && \
+   autoreconf -vif lib/libdvd/libdvdcss
+-autoreconf -vif lib/libdvd/libdvdread
++[ -d lib/libdvd/libdvdread ] && \
++  autoreconf -vif lib/libdvd/libdvdread
+ autoreconf -vif lib/libdvd/libdvdnav
+ autoreconf -vif lib/gtest
+ 
diff --git a/xbmc-11.0-dvdread.patch b/xbmc-12.0-dvdread.patch
index ff98fa3..0c819d0 100644
--- a/xbmc-11.0-dvdread.patch
+++ b/xbmc-12.0-dvdread.patch
@@ -64,13 +64,13 @@
  else
  
 @@ -59,8 +58,8 @@
- 		libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all \
+ 		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 \
+-	$(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 \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O)  libdvdnav/obj/*.o -lm \
  		-Wl,--unresolved-symbols=ignore-all \
  		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
  
diff --git a/xbmc-11.0-hdhomerun.patch b/xbmc-12.0-hdhomerun.patch
index a3ec783..f7ed8ef 100644
--- a/xbmc-11.0-hdhomerun.patch
+++ b/xbmc-12.0-hdhomerun.patch
@@ -1,14 +1,24 @@
---- Makefile.in.orig	2011-12-27 18:13:13.204873013 -0500
-+++ Makefile.in	2011-12-27 18:14:17.225245721 -0500
-@@ -131,7 +131,6 @@
+commit 896387e8d0f501b6f46336dd5928d1e71914486c
+Author: Ken Dreyer <ktdreyer@ktdreyer.com>
+Date:   Fri Aug 24 19:34:47 2012 -0600
+
+    Fedora: use internal hdhomerun
+    
+    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
+
+diff --git a/Makefile.in b/Makefile.in
+index 6be215f..1120178 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -141,7 +141,6 @@ endif
+ LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
- 	lib/cmyth \
 -	lib/libhdhomerun \
  	lib/libid3tag \
  	lib/libapetag \
  	lib/cpluff \
-@@ -267,8 +266,6 @@
+@@ -295,8 +294,6 @@ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
@@ -17,18 +27,20 @@
  libid3tag: dllloader
  	$(MAKE) -C lib/libid3tag
  papcodecs: dllloader dvdpcodecs
-@@ -293,7 +290,7 @@
- 	$(MAKE) -C lib/cximage-6.0
+@@ -322,7 +319,7 @@ imagelib: dllloader
  
  codecs: papcodecs dvdpcodecs
--libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+libs: cmyth libid3tag imagelib libexif system/libcpluff-@ARCH@.so
- externals: codecs libs visualizations screensavers
  
- xcode_depends: \
---- configure.in.orig	2011-12-27 18:16:52.986149450 -0500
-+++ configure.in	2011-12-27 18:17:09.552245330 -0500
-@@ -1877,7 +1877,6 @@
+-libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
++libs: libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+ 
+ externals: codecs libs visualizations screensavers libaddon pvraddons
+ 
+diff --git a/configure.in b/configure.in
+index eabf052..948c9a9 100755
+--- a/configure.in
++++ b/configure.in
+@@ -2041,7 +2041,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
@@ -36,18 +48,20 @@
      lib/libsquish/Makefile \
      lib/libid3tag/Makefile \
      lib/cximage-6.0/Makefile \
---- xbmc/filesystem/DllHDHomeRun.h.orig	2011-12-28 12:16:37.207493443 -0500
-+++ xbmc/filesystem/DllHDHomeRun.h	2011-12-28 12:18:50.854262220 -0500
+diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
+index 8d80cfe..a1134c5 100644
+--- a/xbmc/filesystem/DllHDHomeRun.h
++++ b/xbmc/filesystem/DllHDHomeRun.h
 @@ -21,7 +21,7 @@
   */
  
  #include "DynamicDll.h"
 -#include "lib/libhdhomerun/hdhomerun.h"
-+#include  <hdhomerun/hdhomerun.h>
++#include <hdhomerun/hdhomerun.h>
  
  class DllHdHomeRunInterface
  {
-@@ -42,30 +42,56 @@
+@@ -42,30 +42,56 @@ public:
  
  class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
  {
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 2065e57..5226b8c 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -1,25 +1,27 @@
 #!/bin/sh
 
-MAJORVERSION=11
+MAJORVERSION=12
 MINORVERSION=0
-#PRERELEASE=Eden_rc2
+PRERELEASE=Frodo_alpha6
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
-# GITHUBURL below is obsolete, I think
 #GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
 
-# comment-out line below if using tarball
-#curl -L $GITHUBURL | tar xz
+# download zipball
+if [[ ! -f xbmc-$VERSION.zip ]]; then
+    curl -o xbmc-$VERSION.zip -L $GITHUBURL
+fi
 
-# Repair GitHub's odd auto-generated top-level directory...
-#mv xbmc-xbmc-* xbmc-$VERSION
+# extract zipball
+rm -r xbmc-xbmc-*
+unzip xbmc-$VERSION.zip
 
-# extract tarball
-# comment-out if not using tarball
-tar -xzvf xbmc-$VERSION.tar.gz
+# Repair GitHub's odd auto-generated top-level directory...
+mv xbmc-xbmc-* xbmc-$VERSION
 
-cd xbmc-$VERSION
+pushd xbmc-$VERSION
 
 # remove bundled libraries, saves space and forces using external versions
 # grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream
@@ -62,7 +64,7 @@ do
     rm -r tools/$i
 done
 
-cd ..
+popd
 
 # repack
 tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
diff --git a/xbmc.spec b/xbmc.spec
index 39828e5..90825ec 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,11 +1,11 @@
-#global PRERELEASE Eden_rc2
-%global DIRVERSION %{version}
+%global PRERELEASE Frodo_alpha6
+#global DIRVERSION %{version}
 # use below for pre-release
-#global DIRVERSION %{version}-%{PRERELEASE}
+%global DIRVERSION %{version}-%{PRERELEASE}
 
 Name: xbmc
-Version: 11.0
-Release: 8%{?dist}
+Version: 12.0
+Release: 0.1.%{PRERELEASE}%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -21,11 +21,11 @@ Source1: xbmc-generate-tarball-xz.sh
 
 # new patches for bootstrap
 # no trac ticket filed as yet
-Patch1: xbmc-11.0-bootstrap.patch
+Patch1: xbmc-12.0-bootstrap.patch
 
 # filed ticket, but patch still needs work
 # http://trac.xbmc.org/ticket/9658
-Patch2: xbmc-11.0-dvdread.patch
+Patch2: xbmc-12.0-dvdread.patch
 
 # and new problem with zlib in cximage
 # trac ticket filed: http://trac.xbmc.org/ticket/9659
@@ -34,7 +34,7 @@ Patch3: xbmc-10-disable-zlib-in-cximage.patch
 
 # need to file trac ticket, this patch just forces external hdhomerun
 # functionality, needs to be able fallback internal version
-Patch4: xbmc-11.0-hdhomerun.patch
+Patch4: xbmc-12.0-hdhomerun.patch
 
 # patch pristine Eden source (git tag: 11.0-Eden-r2) against
 # tsp42's back-port of PVR support (including MythTV support) 
@@ -50,7 +50,7 @@ Patch4: xbmc-11.0-hdhomerun.patch
 # (note that hunks within patch that patch ffmpeg needed to be
 # removed, since ffmpeg is removed from original tarball, and other
 # minor tweaks may be needed)
-Patch5: xbmc-11.0-tsp-Eden-pvr.patch
+#Patch5: xbmc-11.0-tsp-Eden-pvr.patch
 
 # Optional deps (not in EPEL)
 # (libbluray in EPEL 6 is too old.)
@@ -152,9 +152,11 @@ BuildRequires: libbluray-devel
 %endif
 BuildRequires: yajl-devel
 BuildRequires: bluez-libs-devel
+BuildRequires: tinyxml-devel
 %if 0%{?_with_cwiid}
 BuildRequires: cwiid-devel
 %endif
+BuildRequires: taglib-devel >= 1.8
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
@@ -214,8 +216,9 @@ forecast functions, together third-party plugins.
 %patch1 -p0
 %patch2 -p0
 #patch3 -p0
-%patch4 -p0
-%patch5 -p1
+%patch4 -p1
+#patch5 -p1
+#patch6 -p1
 
 %if 0%{?_with_hdhomerun}
 %else
@@ -259,11 +262,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
 rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
 
-# remove the old dteirney MythTV add-on (no longer works
-# and can be confused with the new tsp version)
-rm -r $RPM_BUILD_ROOT/%{_libdir}/xbmc/addons/pvr.mythtv
-rm -r $RPM_BUILD_ROOT/%{_datadir}/xbmc/addons/pvr.mythtv
-
 desktop-file-install \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
  $RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
@@ -292,7 +290,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc copying.txt keymapping.txt LICENSE.GPL README.linux
+%doc copying.txt keymapping.txt LICENSE.GPL README
+%doc docs
 %{_bindir}/xbmc
 %{_bindir}/xbmc-standalone
 %{_libdir}/xbmc
@@ -318,6 +317,16 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Thu Oct  4 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 12.0-0.1.Frodo_alpha6
+- Update to Frodo alpha 6
+- Use "12.0" as version, rather than "12.8"
+- Drop desktop patch (now in Frodo alpha6)
+- Add BR for taglib-devel >= 1.8 (libid3tag is being phased out)
+- Rebase patches to 12.0/Frodo where necessary
+
+* Sun Aug 28 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 12.8-0.1.Frodo_alpha4
+- Upgrade to Frodo alpha 4
+
 * Wed Jul 11 2012 Nicolas Chauvet <kwizart@gmail.com> - 11.0-8
 - Switch to pkgconfig(libudev)