Update to Frodo beta 2

- Update to latest version, Frodo beta 2
- Drop patch for linking against pulse-simple
- libjpeg is gone in Fedora. Conditionally build against libjpeg-turbo

4 files changed, 12 insertions, 44 deletions

diff --git a/.gitignore b/.gitignore
index fcc179a..09ce5a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /xbmc-12.0-Frodo_alpha6-patched.tar.xz
 /xbmc-12.0-Frodo_alpha7-patched.tar.xz
 /xbmc-pvr-addons-1e666ced21-patched.tar.xz
+/xbmc-12.0-Frodo_beta2-patched.tar.xz
diff --git a/xbmc-12.0-pulse-simple.patch b/xbmc-12.0-pulse-simple.patch
deleted file mode 100644
index d773fbd..0000000
--- a/xbmc-12.0-pulse-simple.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 d308437..bdefa3e 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,7 +2,7 @@
 
 MAJORVERSION=12
 MINORVERSION=0
-PRERELEASE=Frodo_alpha7
+PRERELEASE=Frodo_beta2
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
diff --git a/xbmc.spec b/xbmc.spec
index d30d26d..10ff953 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE Frodo_alpha7
+%global PRERELEASE Frodo_beta2
 #global DIRVERSION %{version}
 # use the line below for pre-releases
 %global DIRVERSION %{version}-%{PRERELEASE}
@@ -52,10 +52,6 @@ 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}
@@ -81,7 +77,11 @@ BuildRequires: glew-devel
 BuildRequires: libstdc++-devel
 BuildRequires: glib2-devel
 BuildRequires: libjasper-devel
+%if 0%{?el6}
 BuildRequires: libjpeg-devel
+%else
+BuildRequires: libjpeg-turbo-devel
+%endif
 BuildRequires: libogg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
@@ -228,7 +228,6 @@ forecast functions, together third-party plugins.
 #patch3 -p0
 %patch4 -p1
 #patch5 -p1
-%patch6 -p1
 
 %if 0%{?_with_hdhomerun}
 %else
@@ -333,6 +332,11 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Wed Dec 05 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.3.Frodo_beta2
+- Update to Frodo beta 2
+- Drop patch for linking against pulse-simple
+- libjpeg is gone in Fedora. Conditionally build against libjpeg-turbo
+
 * Mon Nov 19 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.3.Frodo_alpha7
 - Rebase HDHomeRun removal to match upstream's file names
 - Conditionally disable libssh BR (unavailable in EL6)