rpms/xbmc/F-20 .cvsignore, 1.26, 1.27 0002-Revert-linux-link-ffmpeg-statically.patch, 1.1, 1.2 sources, 1.28, 1.29 xbmc-generate-tarball-xz.sh, 1.26, 1.27 xbmc.spec, 1.73, 1.74

[Michael Cronenworth]

Author: mooninite

Update of /cvs/free/rpms/xbmc/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4699

Modified Files:
	.cvsignore 0002-Revert-linux-link-ffmpeg-statically.patch 
	sources xbmc-generate-tarball-xz.sh xbmc.spec 
Log Message:
* Sun May 04 2014 Michael Cronenworth <mike at cchtml.com> - 13.0-1
- Update to Gotham final



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	3 May 2014 04:24:36 -0000	1.26
+++ .cvsignore	5 May 2014 00:01:44 -0000	1.27
@@ -1 +1 @@
-xbmc-13.0-Gotham_rc1-patched.tar.xz
+xbmc-13.0-patched.tar.xz

0002-Revert-linux-link-ffmpeg-statically.patch:
 Makefile.in         |   14 --------------
 configure.in        |   15 +--------------
 lib/DllAvCodec.h    |    4 ++--
 lib/DllAvFilter.h   |    2 +-
 lib/DllAvFormat.h   |    8 ++++----
 lib/DllAvUtil.h     |    4 ++--
 lib/DllPostProc.h   |    2 +-
 lib/DllSwResample.h |    4 ++--
 lib/DllSwScale.h    |    4 ++--
 lib/Makefile.in     |   15 ---------------
 10 files changed, 15 insertions(+), 57 deletions(-)

Index: 0002-Revert-linux-link-ffmpeg-statically.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/0002-Revert-linux-link-ffmpeg-statically.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0002-Revert-linux-link-ffmpeg-statically.patch	21 Mar 2014 11:08:50 -0000	1.1
+++ 0002-Revert-linux-link-ffmpeg-statically.patch	5 May 2014 00:01:44 -0000	1.2
@@ -38,7 +38,7 @@
 -             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 @@
 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 @@
 -  # 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 @@
  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 \


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 May 2014 04:24:36 -0000	1.28
+++ sources	5 May 2014 00:01:44 -0000	1.29
@@ -1 +1 @@
-dc6adf4bb5795a9f1b54eb331db37a13  xbmc-13.0-Gotham_rc1-patched.tar.xz
+3e4b9596b6b9572600a798d3c4b522aa  xbmc-13.0-patched.tar.xz


Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xbmc-generate-tarball-xz.sh	3 May 2014 04:24:36 -0000	1.26
+++ xbmc-generate-tarball-xz.sh	5 May 2014 00:01:44 -0000	1.27
@@ -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


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/xbmc.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xbmc.spec	3 May 2014 04:24:36 -0000	1.73
+++ xbmc.spec	5 May 2014 00:01:44 -0000	1.74
@@ -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 @@
 
 
 %changelog
+* Sun May 04 2014 Michael Cronenworth <mike at cchtml.com> - 13.0-1
+- Update to Gotham final
+
 * Thu May 01 2014 Michael Cronenworth <mike at cchtml.com> - 13.0-0.14.Gotham_rc1
 - Update to Gotham RC 1