rpms/xbmc/devel 0001-Revert-drop-support-for-external-ffmpeg.patch, NONE, 1.1 0002-Revert-linux-link-ffmpeg-statically.patch, NONE, 1.1 0003-makefile-include.patch, NONE, 1.1 xbmc-13.0-libmysqlclient.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.24, 1.25 xbmc-13.0-dvdread.patch, 1.2, 1.3 xbmc-13.0-hdhomerun.patch, 1.2, 1.3 xbmc.spec, 1.67, 1.68

Michael Cronenworth mooninite at rpmfusion.org
Tue Mar 18 22:06:36 CET 2014


Author: mooninite

Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1782

Modified Files:
	.cvsignore sources xbmc-13.0-dvdread.patch 
	xbmc-13.0-hdhomerun.patch xbmc.spec 
Added Files:
	0001-Revert-drop-support-for-external-ffmpeg.patch 
	0002-Revert-linux-link-ffmpeg-statically.patch 
	0003-makefile-include.patch xbmc-13.0-libmysqlclient.patch 
Log Message:
* Tue Mar 18 2014 Michael Cronenworth <mike at cchtml.com> - 13.0-0.7.Gotham_beta2
- Update to Gotham beta 2
- Switch away from bcond conditionals


0001-Revert-drop-support-for-external-ffmpeg.patch:
 configure.in |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Revert-drop-support-for-external-ffmpeg.patch ---
>From e55766aa8da7265bea129c70cfd445ad66191fd0 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike at cchtml.com>
Date: Sun, 16 Mar 2014 17:14:03 -0500
Subject: [PATCH 1/2] Revert "drop support for external ffmpeg"

This reverts commit e211654714b2266b80ba65361bda8f715d47933a.

Conflicts:
	configure.in
---
 configure.in | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index f9f5693..c389b76 100644
--- a/configure.in
+++ b/configure.in
@@ -191,6 +191,9 @@ libcec_disabled="== libcec disabled. CEC adapter support will not be available.
 # External library message strings
 external_libraries_enabled="== Use of all supported external libraries enabled. =="
 external_libraries_disabled="== Use of all supported external libraries disabled. =="
+external_ffmpeg_enabled="== Use of external ffmpeg enabled. =="
+external_ffmpeg_disabled="== Use of external ffmpeg disabled. =="
+ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
 dashes="------------------------"
 final_message="\n  XBMC Configuration:"
 final_message="\n$dashes$final_message\n$dashes"
@@ -569,6 +572,12 @@ AC_ARG_ENABLE([external-libraries],
   [use_external_libraries=$enableval],
   [use_external_libraries=no])
 
+AC_ARG_ENABLE([external-ffmpeg],
+  [AS_HELP_STRING([--enable-external-ffmpeg],
+  [enable use of external ffmpeg libraries (default is no) 'Linux only'])],
+  [use_external_ffmpeg=$enableval],
+  [use_external_ffmpeg=$use_external_libraries])
+
 AC_ARG_ENABLE([libav-compat],
   [AS_HELP_STRING([--enable-libav-compat],
   [build a wrapper around libav to provide the functions needed by XBMC. This is
@@ -600,9 +609,6 @@ PKG_PROG_PKG_CONFIG
 MAKE="${MAKE:-make}"
 OBJDUMP="${OBJDUMP:-objdump}"
 
-use_external_ffmpeg=no
-use_static_ffmpeg=no
-
 # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
 # there is no autoconf variable which will give
 # the correct output format when doing cross compilation
-- 
1.8.5.3


0002-Revert-linux-link-ffmpeg-statically.patch:
 Makefile.in         |   14 --------------
 configure.in        |   13 +------------
 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(+), 55 deletions(-)

--- NEW FILE 0002-Revert-linux-link-ffmpeg-statically.patch ---
>From 6df5c168c9de11fa6fdec250ba2b1c732ff3e9a2 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike at cchtml.com>
Date: Sun, 16 Mar 2014 17:23:51 -0500
Subject: [PATCH 2/2] Revert "linux: link ffmpeg statically"

This reverts commit 974a3c0e97b817ca358a959a026db95330673642.

Conflicts:
	Makefile.in
	configure.in
---
 Makefile.in         | 14 ---------------
 configure.in        | 13 +------------
 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     | 14 --------------
 10 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6f689cf..bfadbe6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -472,20 +472,6 @@ ifeq ($(findstring freebsd, at ARCH@),freebsd)
 DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
 endif
 
-ifeq (@USE_STATIC_FFMPEG@,1)
-FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
-             lib/ffmpeg/libavfilter/libavfilter.a \
-             lib/ffmpeg/libswresample/libswresample.a \
-             lib/ffmpeg/libavformat/libavformat.a \
-             lib/ffmpeg/libavutil/libavutil.a \
-             lib/ffmpeg/libpostproc/libpostproc.a \
-             lib/ffmpeg/libswscale/libswscale.a
-DYNOBJSXBMC+= $(FFMPEGOBJS)
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
-
-$(FFMPEGOBJS): dvdpcodecs
-endif
-
 ifneq (@USE_LIBXBMC@,1)
 MAINOBJS+=xbmc/main/main.a
 else
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
     fi
   fi
 fi
-if test "$use_static_ffmpeg" = "yes"; then
-  USE_STATIC_FFMPEG=1
-  AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])
-  # 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`
-  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)
 AC_SUBST(DISABLE_PROJECTM)
 AC_SUBST(USE_SKIN_TOUCHED)
 AC_SUBST(USE_EXTERNAL_FFMPEG)
-AC_SUBST(USE_STATIC_FFMPEG)
 AC_SUBST(USE_LIBAV_HACKS)
 AC_SUBST(PYTHON_VERSION)
 AC_SUBST(OUTPUT_FILES)
@@ -2672,8 +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(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], [
       --disable-ffserver \
       --disable-ffmpeg \
       --disable-crystalhd \
-      `if test "$use_static_ffmpeg" = "yes"; then echo --enable-static --disable-shared; else echo --disable-static --enable-shared; fi` \
+      --enable-shared \
       --disable-doc \
       --enable-postproc \
       --enable-gpl \
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
index af13a15..5cef736 100644
--- a/lib/DllAvCodec.h
+++ b/lib/DllAvCodec.h
@@ -94,7 +94,7 @@ public:
   virtual AVDictionary* av_frame_get_metadata(const AVFrame* frame)=0;
 };
 
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
 
 // Use direct layer
 class DllAvCodec : public DllDynamic, DllAvCodecInterface
@@ -166,7 +166,7 @@ public:
   // DLL faking.
   virtual bool ResolveExports() { return true; }
   virtual bool Load() {
-#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
+#if !defined(TARGET_DARWIN)
     CLog::Log(LOGDEBUG, "DllAvCodec: Using libavcodec system library");
 #endif
     return true;
diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
index 05e5c6f..2200bfa 100644
--- a/lib/DllAvFilter.h
+++ b/lib/DllAvFilter.h
@@ -104,7 +104,7 @@ public:
 #endif
 };
 
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
 // Use direct mapping
 class DllAvFilter : public DllDynamic, DllAvFilterInterface
 {
diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h
index fc7e166..0016c0b 100644
--- a/lib/DllAvFormat.h
+++ b/lib/DllAvFormat.h
@@ -41,7 +41,7 @@ extern "C" {
   void xbmc_read_frame_flush(AVFormatContext *s);
 #else
   #include "libavformat/avformat.h"
-  #if defined(TARGET_DARWIN) || defined(USE_STATIC_FFMPEG)
+  #if defined(TARGET_DARWIN)
     void ff_read_frame_flush(AVFormatContext *s);    // internal replacement 
     #define xbmc_read_frame_flush ff_read_frame_flush
   #endif
@@ -73,7 +73,7 @@ public:
   virtual int av_read_play(AVFormatContext *s)=0;
   virtual int av_read_pause(AVFormatContext *s)=0;
   virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)=0;
-#if (!defined USE_EXTERNAL_FFMPEG) && (!defined TARGET_DARWIN) && (!defined USE_STATIC_FFMPEG)
+#if (!defined USE_EXTERNAL_FFMPEG) && (!defined TARGET_DARWIN)
   virtual int avformat_find_stream_info_dont_call(AVFormatContext *ic, AVDictionary **options)=0;
 #endif
   virtual int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options)=0;
@@ -108,7 +108,7 @@ public:
 #endif
 };
 
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
 
 // Use direct mapping
 class DllAvFormat : public DllDynamic, DllAvFormatInterface
@@ -170,7 +170,7 @@ public:
   // DLL faking.
   virtual bool ResolveExports() { return true; }
   virtual bool Load() {
-#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
+#if !defined(TARGET_DARWIN)
     CLog::Log(LOGDEBUG, "DllAvFormat: Using libavformat system library");
 #endif
     CSingleLock lock(DllAvCodec::m_critSection);
diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
index 0fcdf10..ce5889b 100644
--- a/lib/DllAvUtil.h
+++ b/lib/DllAvUtil.h
@@ -116,7 +116,7 @@ public:
 #endif
 };
 
-#if defined (USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if defined (USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
 // Use direct layer
 class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
 {
@@ -174,7 +174,7 @@ public:
    // DLL faking.
    virtual bool ResolveExports() { return true; }
    virtual bool Load() {
-#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
+#if !defined(TARGET_DARWIN)
      CLog::Log(LOGDEBUG, "DllAvUtilBase: Using libavutil system library");
 #endif
      return true;
diff --git a/lib/DllPostProc.h b/lib/DllPostProc.h
index e9542eb..0265651 100644
--- a/lib/DllPostProc.h
+++ b/lib/DllPostProc.h
@@ -78,7 +78,7 @@ public:
   virtual void pp_free_context(pp_context *ppContext)=0;
 };
 
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
 
 // We call directly.
 class DllPostProc : public DllDynamic, DllPostProcInterface
diff --git a/lib/DllSwResample.h b/lib/DllSwResample.h
index cd1452b..854d250 100644
--- a/lib/DllSwResample.h
+++ b/lib/DllSwResample.h
@@ -60,7 +60,7 @@ public:
   virtual int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensation_distance) = 0;
 };
 
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
 
 // Use direct mapping
 class DllSwResample : public DllDynamic, DllSwResampleInterface
@@ -71,7 +71,7 @@ public:
   // DLL faking.
   virtual bool ResolveExports() { return true; }
   virtual bool Load() {
-#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
+#if !defined(TARGET_DARWIN)
     CLog::Log(LOGDEBUG, "DllAvFormat: Using libswresample system library");
 #endif
     return true;
diff --git a/lib/DllSwScale.h b/lib/DllSwScale.h
index 97e3b40..36bb616 100644
--- a/lib/DllSwScale.h
+++ b/lib/DllSwScale.h
@@ -87,7 +87,7 @@ public:
    virtual void sws_freeContext(struct SwsContext *context)=0;
 };
 
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) 
 
 // We call into this library directly.
 class DllSwScale : public DllDynamic, public DllSwScaleInterface
@@ -111,7 +111,7 @@ public:
   // DLL faking.
   virtual bool ResolveExports() { return true; }
   virtual bool Load() {
-#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG)
+#if !defined(TARGET_DARWIN)
     CLog::Log(LOGDEBUG, "DllSwScale: Using libswscale system library");
 #endif
     return true;
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ca18a4a..906219c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -27,7 +27,6 @@ endif
 
 LIBS=
 ifneq (@USE_EXTERNAL_FFMPEG@,1)
-ifneq (@USE_STATIC_FFMPEG@,1)
   LIBS+=$(AVUTIL_SO) \
 	$(AVCODEC_SO) \
 	$(AVFORMAT_SO) \
@@ -36,12 +35,10 @@ ifneq (@USE_STATIC_FFMPEG@,1)
 	$(SWSCALE_SO) \
 	$(SWRESAMPLE_SO)
 endif
-endif
 
 .PHONY: $(DIRS) codecs
 
 ifneq ($(findstring osx,$(ARCH)), osx)
-ifneq (@USE_STATIC_FFMPEG@,1)
 
 codecs: $(addprefix $(SYSDIR)/, $(LIBS));
 
@@ -74,17 +71,6 @@ ffmpeg/libswscale/libswscale.so   : ffmpeg;
 ffmpeg/libpostproc/libpostproc.so : ffmpeg;
 ffmpeg/libswresample/libswresample.so : ffmpeg;
 endif
-endif
-
-ifeq (@USE_STATIC_FFMPEG@,1)
-ffmpeg/libavutil/libavutil.a     : ffmpeg;
-ffmpeg/libavcodec/libavcodec.a   : ffmpeg;
-ffmpeg/libavformat/libavformat.a : ffmpeg;
-ffmpeg/libavfilter/libavfilter.a : ffmpeg;
-ffmpeg/libswscale/libswscale.a   : ffmpeg;
-ffmpeg/libpostproc/libpostproc.a : ffmpeg;
-ffmpeg/libswresample/libswresample.a : ffmpeg;
-endif
 
 ffmpeg:
 	$(MAKE) -C $@
-- 
1.8.5.3


0003-makefile-include.patch:
 Makefile.include.in |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 0003-makefile-include.patch ---
--- a/Makefile.include.in	2014-03-16 15:34:08.479015885 -0500
+++ b/Makefile.include.in	2014-03-16 18:58:00.770693019 -0500
@@ -58,6 +58,11 @@
 	@SDL_DEFINES@ \
 	@DEFS@ \
 
+ifeq (@USE_EXTERNAL_FFMPEG@,1)
+	DEFINES+=-DUSE_EXTERNAL_FFMPEG \
+
+endif
+
 ifeq ($(findstring osx,$(ARCH)), osx)
 	INCLUDES+=-I at abs_top_srcdir@/xbmc/osx
 endif

xbmc-13.0-libmysqlclient.patch:
 configure.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xbmc-13.0-libmysqlclient.patch ---
>From 72331ff10f1815cb0c1b64dd15a16aa9b14b1559 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Sat, 22 Feb 2014 13:46:01 -0700
Subject: [PATCH 3/3] Fedora: selectively avoid linking libmysqlclient

If libmysqlclient and libtspi are linked to the same binary, we get a
segfault. In XBMC, libavfilter pulls in libgnutls, which pulls in
libtspi.

See https://bugzilla.redhat.com/1069079
---
 configure.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.in b/configure.in
index 2060e24..2a20339 100644
--- a/configure.in
+++ b/configure.in
@@ -2898,6 +2898,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
   ./configure  \
     CFLAGS="$CFLAGS" \ 
     CXXFLAGS="$CXXFLAGS" \
+    LIBS="$(echo $LIBS | sed -e s/-lmysqlclient//g)" \
     --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
     --host=$host_alias \
     --build=$build_alias \
@@ -2924,6 +2925,7 @@ XB_CONFIG_MODULE([xbmc/screensavers/rsxs-0.9/], [
     CXX="$CXX" \
     CFLAGS="$TEMPCFLAGS" \ 
     CXXFLAGS="$CXXFLAGS" \
+    LIBS="$(echo $LIBS | sed -e s/-lmysqlclient//g)" \
     `if test "$host_vendor" = "apple"; then echo --with-png=${prefix} --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib; fi` \
     --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
     --host=$host_alias \
-- 
1.8.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	25 Nov 2013 06:11:34 -0000	1.22
+++ .cvsignore	18 Mar 2014 21:06:35 -0000	1.23
@@ -1 +1 @@
-xbmc-13.0-Gotham_alpha9-patched.tar.xz
+xbmc-13.0-Gotham_beta2-patched.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Nov 2013 06:11:34 -0000	1.24
+++ sources	18 Mar 2014 21:06:35 -0000	1.25
@@ -1 +1 @@
-0604fb81c3ce2a0129fb30a478892d0f  xbmc-13.0-Gotham_alpha9-patched.tar.xz
+67cad8f41c32ff4dcce55fb07aefa0e6  xbmc-13.0-Gotham_beta2-patched.tar.xz

xbmc-13.0-dvdread.patch:
 bootstrap.mk           |    5 -----
 configure.in           |   19 -------------------
 lib/libdvd/Makefile.in |   21 +++++++--------------
 3 files changed, 7 insertions(+), 38 deletions(-)

Index: xbmc-13.0-dvdread.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-13.0-dvdread.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc-13.0-dvdread.patch	25 Nov 2013 06:11:34 -0000	1.2
+++ xbmc-13.0-dvdread.patch	18 Mar 2014 21:06:36 -0000	1.3
@@ -1,15 +1,15 @@
-From 8a7a8d18094791bd57237b014cbd88fb033aab4d Mon Sep 17 00:00:00 2001
+From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001
 From: Ken Dreyer <ktdreyer at ktdreyer.com>
-Date: Sun, 24 Nov 2013 21:13:37 -0700
-Subject: [PATCH 1/2] Fedora: use external dvdread
+Date: Mon, 6 May 2013 17:07:40 -0600
+Subject: [PATCH 1/3] Fedora: use external dvdread
 
 Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
 (cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
 ---
  bootstrap.mk           |  5 -----
- configure.in           | 22 +---------------------
+ configure.in           | 19 -------------------
  lib/libdvd/Makefile.in | 20 +++++++-------------
- 3 files changed, 8 insertions(+), 39 deletions(-)
+ 3 files changed, 7 insertions(+), 37 deletions(-)
 
 diff --git a/bootstrap.mk b/bootstrap.mk
 index 8bc4795..1fc31a4 100644
@@ -35,10 +35,10 @@
  	autoreconf -vif $(@D)
  	- at rm -rf $(@D)/autom4te.cache
 diff --git a/configure.in b/configure.in
-index 294e300..7a52036 100644
+index beb8aac..343292e 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2825,29 +2825,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
+@@ -2861,28 +2861,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
      --with-pic
  ], [$SKIP_CONFIG_DVDCSS])
  
@@ -54,7 +54,6 @@
 -    --disable-strip \
 -    --disable-opts \
 -    --cc="$CC" &&
--  $MAKE dvdread-config &&
 -  mkdir -p `pwd`/../includes/dvdread
 -  cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
 -  cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
@@ -62,10 +61,9 @@
 -
  XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
    ./configure2 \
--    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
+     --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
 -    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
--    --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
-+    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC" \
+-    --with-dvdread-config="`pwd`/../dvdread-config" \
      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
      --host=$host_alias \
      --build=$build_alias \
@@ -137,5 +135,5 @@
  libdvdnav: compile
  	$(MAKE) -C $@
 -- 
-1.8.3.1
+1.8.5.3
 

xbmc-13.0-hdhomerun.patch:
 Makefile.in                    |    5 --
 configure.in                   |    1 
 xbmc/filesystem/DllHDHomeRun.h |   79 ++++++++++++++++++++++++++---------------
 3 files changed, 53 insertions(+), 32 deletions(-)

Index: xbmc-13.0-hdhomerun.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-13.0-hdhomerun.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc-13.0-hdhomerun.patch	25 Nov 2013 06:11:34 -0000	1.2
+++ xbmc-13.0-hdhomerun.patch	18 Mar 2014 21:06:36 -0000	1.3
@@ -1,7 +1,7 @@
-From f79620d0bd702d4257e28e3083c893522a008c2d Mon Sep 17 00:00:00 2001
+From 6c05d16be3bae96479363c2117c28c4261374ab4 Mon Sep 17 00:00:00 2001
 From: Ken Dreyer <ktdreyer at ktdreyer.com>
 Date: Fri, 24 Aug 2012 19:34:47 -0600
-Subject: [PATCH 2/2] Fedora: use external hdhomerun
+Subject: [PATCH 2/3] Fedora: use external hdhomerun
 
 Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
 (cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
@@ -12,10 +12,12 @@
  3 files changed, 53 insertions(+), 31 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 618ca25..842fbc6 100644
+index 8eda3c4..fbb19bd 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -205,7 +205,6 @@ endif
+@@ -205,11 +205,10 @@ PAPCODECS_DIRS+= \
+ endif
+ 
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
@@ -23,7 +25,11 @@
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
-@@ -411,8 +410,6 @@ libexif: dllloader
+ ifeq (@USE_MYSQL@,1)
+ LIB_DIRS += lib/cmyth
+@@ -413,12 +412,10 @@ else
+ endif
+ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
@@ -31,21 +37,27 @@
 -	$(MAKE) -C lib/libhdhomerun
  papcodecs: dllloader dvdpcodecs
  	test -d system/players/paplayer || mkdir system/players/paplayer
- 	$(MAKE) -C lib/xbadpcm
-@@ -441,7 +438,7 @@ endif
+ 	$(MAKE) -C lib/vgmstream
+ 	$(MAKE) -C lib/timidity
+ 	$(MAKE) -C lib/nosefart
+@@ -442,11 +439,11 @@ ifeq (@USE_PVR_ADDONS@,1)
+ 	$(MAKE) -C pvr-addons
+ endif
  
- codecs: papcodecs dvdpcodecs
+ codecs: papcodecs dvdpcodecs dvdpextcodecs
  
 -libs: libhdhomerun imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
 +libs: imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
  
  externals: codecs libs visualizations screensavers libaddon pvraddons
  
+ xcode_depends: \
+ 	codecs libs visualizations screensavers eventclients skins libaddon \
 diff --git a/configure.in b/configure.in
-index 7a52036..717bb3b 100644
+index 343292e..2060e24 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2518,7 +2518,6 @@ OUTPUT_FILES="Makefile \
+@@ -2544,7 +2544,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
@@ -149,5 +161,5 @@
  };
  
 -- 
-1.8.3.1
+1.8.5.3
 


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- xbmc.spec	25 Nov 2013 06:11:34 -0000	1.67
+++ xbmc.spec	18 Mar 2014 21:06:36 -0000	1.68
@@ -1,4 +1,4 @@
-%global PRERELEASE Gotham_alpha9
+%global PRERELEASE Gotham_beta2
 #%%global DIRVERSION %{version}
 # use the line below for pre-releases
 %global DIRVERSION %{version}-%{PRERELEASE}
@@ -6,7 +6,7 @@
 
 Name: xbmc
 Version: 13.0
-Release: 0.2.Gotham_alpha9%{?dist}
+Release: 0.7.Gotham_beta2%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -25,20 +25,31 @@
 # functionality, needs to be able fallback internal version
 Patch2: xbmc-13.0-hdhomerun.patch
 
+# Avoid segfault during goom's configure
+# https://bugzilla.redhat.com/1069079
+Patch3: xbmc-13.0-libmysqlclient.patch
+
+# External ffmpeg patches
+Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch
+Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch
+Patch102: 0003-makefile-include.patch
 
 # Optional deps (not in EPEL)
+%if 0%{?fedora}
 # (libbluray in EPEL 6 is too old.)
-%{?fedora:%global _with_hdhomerun 1}
+%global with_libbluray 1
+%global with_cwiid 1
+%global with_libssh 1
+%global with_libcec 1
+%global with_external_ffmpeg 1
+%endif
+
 %ifarch x86_64 i686
-%{?fedora:%global _with_crystalhd 1}
+%global with_crystalhd 1
+%global with_hdhomerun 1
 %endif
-%{?fedora:%global _with_libbluray 1}
-%{?fedora:%global _with_cwiid     1}
-%{?fedora:%global _with_libssh    1}
-%{?fedora:%global _with_libcec    1}
 
 ExcludeArch: ppc64
-Buildroot: %{_tmppath}/%{name}-%{version}
 Summary: Media center
 License: GPLv2+ and GPLv3+
 Group: Applications/Multimedia
@@ -104,15 +115,17 @@
 BuildRequires: libtiff-devel
 BuildRequires: libvdpau-devel
 BuildRequires: libdvdread-devel
+%if 0%{with_external_ffmpeg}
 BuildRequires: ffmpeg-devel
+%endif
 BuildRequires: faad2-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libdca-devel
 BuildRequires: libass-devel >= 0.9.7
-%if 0%{?_with_hdhomerun}
+%if 0%{with_hdhomerun}
 BuildRequires: hdhomerun-devel
 %endif
-%if 0%{?_with_crystalhd}
+%if 0%{with_crystalhd}
 BuildRequires: libcrystalhd-devel
 %endif
 BuildRequires: libmodplug-devel
@@ -128,27 +141,30 @@
 BuildRequires: gettext-autopoint
 %endif
 BuildRequires: librtmp-devel
-%if 0%{?_with_libbluray}
+%if 0%{with_libbluray}
 BuildRequires: libbluray-devel
 #BuildRequires: libbluray-devel >= 0.2.1
 %endif
 BuildRequires: yajl-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: tinyxml-devel
-%if 0%{?_with_cwiid}
+%if 0%{with_cwiid}
 BuildRequires: cwiid-devel
 %endif
 BuildRequires: taglib-devel >= 1.8
 BuildRequires: swig
 BuildRequires: java-devel
 BuildRequires: lame-devel
-%if 0%{?_with_libssh}
+%if 0%{with_libssh}
 BuildRequires: libssh-devel
 %endif
 BuildRequires: libcap-devel
-%if 0%{?_with_libcec}
+%if 0%{with_libcec}
 BuildRequires: libcec-devel
 %endif
+BuildRequires: libxml-devel
+BuildRequires: libxslt-devel
+BuildRequires: trousers-devel
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
@@ -160,16 +176,16 @@
 # pseudo-DLL loading scheme (sigh)
 Requires: librtmp
 Requires: libmad
-%if 0%{?_with_hdhomerun}
+%if 0%{with_hdhomerun}
 BuildRequires: hdhomerun
 %endif
-%if 0%{?_with_crystalhd}
+%if 0%{with_crystalhd}
 Requires: libcrystalhd
 %endif
-%if 0%{?_with_libbluray}
+%if 0%{with_libbluray}
 Requires: libbluray
 %endif
-%if 0%{?_with_libcec}
+%if 0%{with_libcec}
 Requires: libcec
 %endif
 
@@ -221,8 +237,13 @@
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
 
-%if 0%{?_with_hdhomerun}
+%if 0%{with_hdhomerun}
 %else
   # Remove hdhomerun from the build.
   pushd xbmc/filesystem/
@@ -246,22 +267,33 @@
 --prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
 --libdir=%{_libdir} --datadir=%{_datadir} \
 --with-lirc-device=/var/run/lirc/lircd \
---enable-goom \
 --enable-external-libraries \
+--enable-goom \
 --enable-pulse \
-%if 0%{?_with_libcec}
+%if 0%{with_libcec}
 --enable-libcec \
+%else
+--disable-libcec \
 %endif
-%if 0%{?_with_libssh} == 0
+%if 0%{with_libssh}
+--enable-ssh \
+%else
 --disable-ssh \
 %endif
 --disable-dvdcss \
 --disable-optimizations --disable-debug \
+%if 0%{with_external_ffmpeg}
 CPPFLAGS="-I/usr/include/ffmpeg" \
 CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
+%else
+CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
+CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
+%endif
 LDFLAGS="-fPIC" \
-LIBS="-L%{_libdir}/mysql %{?_with_hdhomerun:-lhdhomerun} $LIBS" \
+%if 0%{?with_hdhomerun}
+LIBS=" -lhdhomerun $LIBS" \
+%endif
 ASFLAGS=-fPIC
 
 make %{?_smp_mflags} VERBOSE=1
@@ -331,6 +363,27 @@
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Tue Mar 18 2014 Michael Cronenworth <mike at cchtml.com> - 13.0-0.7.Gotham_beta2
+- Switch away from bcond conditionals
+
+* Sun Mar 16 2014 Michael Cronenworth <mike at cchtml.com> - 13.0-0.6.Gotham_beta2
+- Update to Gotham beta 2
+- use external ffmpeg
+
+* Fri Mar 14 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 13.0-0.5.Gotham_beta1
+- Update to Gotham beta 1
+- Update Goom/MySQL patch, per RHBZ #1069079
+
+* Fri Feb 21 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 13.0-0.4.Gotham_alpha11
+- use internal ffmpeg
+- switch to bcond conditionals
+- remove hardcoded mysql directory in LIBS, since mysql_config will insert this
+  automatically.
+- rm BuildRoot
+
+* Mon Jan 27 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 13.0-0.3.Gotham_alpha11
+- Update to Gotham alpha 11
+
 * Mon Nov 25 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 13.0-0.3.Gotham_alpha9
 - Update to Gotham alpha 9
 


More information about the rpmfusion-commits mailing list