Update to Gotham final

A late patch to the Makefile and configure files required a
tweak of the ffmpeg patch.

3 files changed, 17 insertions, 12 deletions

diff --git a/0002-Revert-linux-link-ffmpeg-statically.patch b/0002-Revert-linux-link-ffmpeg-statically.patch
index ba49693..c237b33 100644
--- a/0002-Revert-linux-link-ffmpeg-statically.patch
+++ b/0002-Revert-linux-link-ffmpeg-statically.patch
@@ -38,7 +38,7 @@ index 6f689cf..bfadbe6 100644
 -             lib/ffmpeg/libpostproc/libpostproc.a \
 -             lib/ffmpeg/libswscale/libswscale.a
 -DYNOBJSXBMC+= $(FFMPEGOBJS)
--LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
+-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
 -
 -$(FFMPEGOBJS): dvdpcodecs
 -endif
@@ -50,7 +50,7 @@ diff --git a/configure.in b/configure.in
 index c389b76..0c6fc47 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -880,14 +880,6 @@ elif test "$use_arch" = "arm"; then
+@@ -874,15 +874,6 @@ elif test "$use_arch" = "arm"; then
      fi
    fi
  fi
@@ -60,12 +60,13 @@ index c389b76..0c6fc47 100644
 -  # ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker
 -  # command in order to resolve any missing symbols
 -  GNUTLS_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls`
+-  HOGWEED_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors hogweed nettle`
 -  VORBISENC_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc`
 -fi 
  
  # Checks for library functions.
  AC_FUNC_ALLOCA
-@@ -2626,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC)
+@@ -2627,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC)
  AC_SUBST(DISABLE_PROJECTM)
  AC_SUBST(USE_SKIN_TOUCHED)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
@@ -73,16 +74,17 @@ index c389b76..0c6fc47 100644
  AC_SUBST(USE_LIBAV_HACKS)
  AC_SUBST(PYTHON_VERSION)
  AC_SUBST(OUTPUT_FILES)
-@@ -2672,8 +2663,6 @@ AC_SUBST(USE_ANDROID)
+@@ -2673,9 +2663,6 @@ AC_SUBST(USE_ANDROID)
  AC_SUBST(GTEST_CONFIGURED)
  AC_SUBST(USE_DOXYGEN)
  AC_SUBST(USE_PVR_ADDONS)
 -AC_SUBST(GNUTLS_ALL_LIBS)
+-AC_SUBST(HOGWEED_ALL_LIBS)
 -AC_SUBST(VORBISENC_ALL_LIBS)
  
  # pushd and popd are not available in other shells besides bash, so implement
  # our own pushd/popd functions
-@@ -2830,7 +2819,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
+@@ -2832,7 +2819,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
        --disable-ffserver \
        --disable-ffmpeg \
        --disable-crystalhd \
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 9beb5c3..00324bd 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,12 +2,12 @@
 
 MAJORVERSION=13
 MINORVERSION=0
-PRERELEASE=Gotham_rc1
+#PRERELEASE=Gotham_rc1
 
 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-Gotham
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
 
 # download zipball
 if [[ ! -f xbmc-$VERSION.zip ]]; then
diff --git a/xbmc.spec b/xbmc.spec
index 12d378c..c78676e 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,12 +1,12 @@
-%global PRERELEASE Gotham_rc1
-#%%global DIRVERSION %{version}
+#global PRERELEASE Gotham_rc1
+%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: 13.0
-Release: 0.14.Gotham_rc1%{?dist}
+Release: 1%{?dist}
 Summary: Media center
 
 License: GPLv2+ and GPLv3+
@@ -383,6 +383,9 @@ fi
 
 
 %changelog
+* Sun May 04 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-1
+- Update to Gotham final
+
 * Thu May 01 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-0.14.Gotham_rc1
 - Update to Gotham RC 1