update to Frodo alpha 7

- Drop bootstrap patch (system libdvdread works properly now)
- Add upstream patch for linking against pulse-simple
- Add BR for libssh
- Rebase external hdhomerun patch onto alpha7

6 files changed, 70 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
index 7109258..96ca3f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /sources
 /xbmc-9.11-patched.tar.xz
 /xbmc-12.0-Frodo_alpha6-patched.tar.xz
+/xbmc-12.0-Frodo_alpha7-patched.tar.xz
diff --git a/xbmc-12.0-bootstrap.patch b/xbmc-12.0-bootstrap.patch
deleted file mode 100644
index 00aa1d4..0000000
--- a/xbmc-12.0-bootstrap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-12.0-hdhomerun.patch b/xbmc-12.0-hdhomerun.patch
index f7ed8ef..32fccfa 100644
--- a/xbmc-12.0-hdhomerun.patch
+++ b/xbmc-12.0-hdhomerun.patch
@@ -1,4 +1,4 @@
-commit 896387e8d0f501b6f46336dd5928d1e71914486c
+commit c6db60512b4ed9d9252a9234935b23fb1b970080
 Author: Ken Dreyer <ktdreyer@ktdreyer.com>
 Date:   Fri Aug 24 19:34:47 2012 -0600
 
@@ -7,52 +7,52 @@ Date:   Fri Aug 24 19:34:47 2012 -0600
     Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
 
 diff --git a/Makefile.in b/Makefile.in
-index 6be215f..1120178 100755
+index 31826b1..20eb86d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -141,7 +141,6 @@ endif
+@@ -179,7 +179,6 @@ endif
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
 -	lib/libhdhomerun \
- 	lib/libid3tag \
- 	lib/libapetag \
  	lib/cpluff \
-@@ -295,8 +294,6 @@ libexif: dllloader
+ 	lib/xbmc-dll-symbols
+ 
+@@ -356,8 +355,6 @@ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
 -libhdhomerun: dllloader
 -	$(MAKE) -C lib/libhdhomerun
- libid3tag: dllloader
- 	$(MAKE) -C lib/libid3tag
  papcodecs: dllloader dvdpcodecs
-@@ -322,7 +319,7 @@ imagelib: dllloader
+ 	test -d system/players/paplayer || mkdir system/players/paplayer
+ 	$(MAKE) -C lib/xbadpcm
+@@ -386,7 +383,7 @@ endif
  
  codecs: papcodecs dvdpcodecs
  
--libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
-+libs: libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+-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 eabf052..948c9a9 100755
+index ce40a5b..18df99c 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2041,7 +2041,6 @@ OUTPUT_FILES="Makefile \
+@@ -2361,7 +2361,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
 -    lib/libhdhomerun/Makefile \
      lib/libsquish/Makefile \
-     lib/libid3tag/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 8d80cfe..a1134c5 100644
+index 1667fde..48bdae3 100644
 --- a/xbmc/filesystem/DllHDHomeRun.h
 +++ b/xbmc/filesystem/DllHDHomeRun.h
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
   */
  
  #include "DynamicDll.h"
@@ -61,7 +61,7 @@ index 8d80cfe..a1134c5 100644
  
  class DllHdHomeRunInterface
  {
-@@ -42,30 +42,56 @@ public:
+@@ -41,30 +41,56 @@ public:
  
  class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
  {
diff --git a/xbmc-12.0-pulse-simple.patch b/xbmc-12.0-pulse-simple.patch
new file mode 100644
index 0000000..d773fbd
--- /dev/null
+++ b/xbmc-12.0-pulse-simple.patch
@@ -0,0 +1,37 @@
+commit 5bde637bc2c325832a968959d29bb6d3e5834861
+Author: bobo1on1 <bob-nospam-@xbmc.org>
+Date:   Mon Nov 12 02:52:55 2012 +0100
+
+    fixed: link to pulse-simple, it's needed for CPulseAE::CanInit(), apparently not all distros link libpulse to libpulse-simple
+
+diff --git a/configure.in b/configure.in
+index 7889dde..ce40a5b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1141,15 +1141,18 @@ if test "x$use_pulse" != "xno"; then
+     fi
+     USE_PULSE=0
+   else
+-    AC_CHECK_LIB([pulse], [main],,
+-      [if test "x$use_pulse" = "xyes"; then
+-        AC_MSG_ERROR($pulse_not_found)
+-      else
+-        use_pulse=no
+-        USE_PULSE=0
+-        AC_MSG_RESULT($pulse_not_found)
+-      fi])
++    AC_CHECK_LIB([pulse],[main],,pulse_found="no")
++    AC_CHECK_LIB([pulse-simple],[main],,pulse_found="no")
++
++    if test "x$pulse_found" != "xno"; then
+       USE_PULSE=1
++    elif test "x$use_pulse" = "xyes"; then
++      AC_MSG_ERROR($pulse_not_found)
++    else
++      use_pulse=no
++      USE_PULSE=0
++      AC_MSG_RESULT($pulse_not_found)
++    fi
+   fi
+ else
+   AC_MSG_RESULT($pulse_disabled)
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 338db80..d308437 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,7 +2,7 @@
 
 MAJORVERSION=12
 MINORVERSION=0
-PRERELEASE=Frodo_alpha6
+PRERELEASE=Frodo_alpha7
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
diff --git a/xbmc.spec b/xbmc.spec
index c621e24..6d27fb9 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE Frodo_alpha6
+%global PRERELEASE Frodo_alpha7
 #global DIRVERSION %{version}
 # use the line below for pre-releases
 %global DIRVERSION %{version}-%{PRERELEASE}
@@ -19,10 +19,6 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz
 # where <version> is the particular version being used
 Source1: xbmc-generate-tarball-xz.sh
 
-# new patches for bootstrap
-# no trac ticket filed as yet
-Patch1: xbmc-12.0-bootstrap.patch
-
 # filed ticket, but patch still needs work
 # http://trac.xbmc.org/ticket/9658
 Patch2: xbmc-12.0-dvdread.patch
@@ -52,6 +48,10 @@ Patch4: xbmc-12.0-hdhomerun.patch
 # minor tweaks may be needed)
 #Patch5: xbmc-11.0-tsp-Eden-pvr.patch
 
+# Link against pulse-simple.
+# This patch is upstream in master, but it is not in alpha 7.
+Patch6: xbmc-12.0-pulse-simple.patch
+
 # Optional deps (not in EPEL)
 # (libbluray in EPEL 6 is too old.)
 %{?fedora:%global _with_hdhomerun 1}
@@ -160,6 +160,7 @@ BuildRequires: taglib-devel >= 1.8
 BuildRequires: swig
 BuildRequires: java-devel
 BuildRequires: lame-devel
+BuildRequires: libssh-devel
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
@@ -216,12 +217,11 @@ forecast functions, together third-party plugins.
 
 %setup -q -n %{name}-%{DIRVERSION}
 
-%patch1 -p0
 %patch2 -p0
 #patch3 -p0
 %patch4 -p1
 #patch5 -p1
-#patch6 -p1
+%patch6 -p1
 
 %if 0%{?_with_hdhomerun}
 %else
@@ -321,6 +321,13 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Tue Nov 13 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.1.Frodo_alpha7
+- Update to Frodo alpha 7
+- Drop bootstrap patch (system libdvdread works properly now)
+- Add upstream patch for linking against pulse-simple
+- Add BR for libssh
+- Rebase external hdhomerun patch onto alpha7
+
 * 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"