From 28a2452d4c062374904931371cd00b322ee277ca Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Sun, 16 Mar 2014 19:46:09 -0500 Subject: Update to Gotham beta 2, enable external ffmpeg Signed-off-by: Michael Cronenworth --- 0001-Revert-drop-support-for-external-ffmpeg.patch | 53 ++++ 0002-Revert-linux-link-ffmpeg-statically.patch | 293 +++++++++++++++++++++ 0003-makefile-include.patch | 14 + xbmc-13.0-hdhomerun.patch | 20 +- xbmc-generate-tarball-xz.sh | 4 +- xbmc.spec | 25 +- 6 files changed, 400 insertions(+), 9 deletions(-) create mode 100644 0001-Revert-drop-support-for-external-ffmpeg.patch create mode 100644 0002-Revert-linux-link-ffmpeg-statically.patch create mode 100644 0003-makefile-include.patch diff --git a/0001-Revert-drop-support-for-external-ffmpeg.patch b/0001-Revert-drop-support-for-external-ffmpeg.patch new file mode 100644 index 0000000..d0920b3 --- /dev/null +++ b/0001-Revert-drop-support-for-external-ffmpeg.patch @@ -0,0 +1,53 @@ +From e55766aa8da7265bea129c70cfd445ad66191fd0 Mon Sep 17 00:00:00 2001 +From: Michael Cronenworth +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 + diff --git a/0002-Revert-linux-link-ffmpeg-statically.patch b/0002-Revert-linux-link-ffmpeg-statically.patch new file mode 100644 index 0000000..ba49693 --- /dev/null +++ b/0002-Revert-linux-link-ffmpeg-statically.patch @@ -0,0 +1,293 @@ +From 6df5c168c9de11fa6fdec250ba2b1c732ff3e9a2 Mon Sep 17 00:00:00 2001 +From: Michael Cronenworth +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,@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 + diff --git a/0003-makefile-include.patch b/0003-makefile-include.patch new file mode 100644 index 0000000..d3687e6 --- /dev/null +++ b/0003-makefile-include.patch @@ -0,0 +1,14 @@ +--- 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@abs_top_srcdir@/xbmc/osx + endif diff --git a/xbmc-13.0-hdhomerun.patch b/xbmc-13.0-hdhomerun.patch index 434c8f7..65db620 100644 --- a/xbmc-13.0-hdhomerun.patch +++ b/xbmc-13.0-hdhomerun.patch @@ -15,7 +15,9 @@ diff --git a/Makefile.in b/Makefile.in index 8eda3c4..fbb19bd 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -208,7 +208,6 @@ endif +@@ -205,11 +205,10 @@ PAPCODECS_DIRS+= \ + endif + LIB_DIRS=\ lib/cximage-6.0 \ lib/libexif \ @@ -23,7 +25,11 @@ index 8eda3c4..fbb19bd 100644 lib/cpluff \ lib/xbmc-dll-symbols -@@ -416,8 +415,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,8 +37,12 @@ index 8eda3c4..fbb19bd 100644 - $(MAKE) -C lib/libhdhomerun papcodecs: dllloader dvdpcodecs test -d system/players/paplayer || mkdir system/players/paplayer - $(MAKE) -C lib/xbadpcm -@@ -446,7 +443,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 dvdpextcodecs @@ -41,6 +51,8 @@ index 8eda3c4..fbb19bd 100644 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 343292e..2060e24 100644 --- a/configure.in diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index dedefe0..bb5b8fd 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -2,7 +2,7 @@ MAJORVERSION=13 MINORVERSION=0 -PRERELEASE=Gotham-beta1 +PRERELEASE=Gotham_beta2 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} @@ -27,7 +27,7 @@ pushd xbmc-$VERSION # grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream # seems to require files within that subdirectory , filed # http://trac.xbmc.org/ticket/12370 -for i in cximage-6.0/zlib libhdhomerun libmpeg2 +for i in cximage-6.0/zlib libhdhomerun libmpeg2 ffmpeg do rm -r lib/$i done diff --git a/xbmc.spec b/xbmc.spec index 4daa1ce..e780ab5 100644 --- a/xbmc.spec +++ b/xbmc.spec @@ -1,4 +1,4 @@ -%global PRERELEASE Gotham-beta1 +%global PRERELEASE Gotham_beta2 #%%global DIRVERSION %{version} # use the line below for pre-releases %global DIRVERSION %{version}-%{PRERELEASE} @@ -6,11 +6,11 @@ # It will no longer be possible to build with external ffmpeg. # https://github.com/xbmc/xbmc/pull/4005 -%bcond_without external_ffmpeg +%bcond_with external_ffmpeg Name: xbmc Version: 13.0 -Release: 0.5.Gotham_beta1%{?dist} +Release: 0.6.Gotham_beta2%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -33,6 +33,11 @@ Patch2: xbmc-13.0-hdhomerun.patch # 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.) @@ -236,6 +241,10 @@ libraries, you need to install this package. %patch2 -p1 %patch3 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 + %if %{with hdhomerun} %else # Remove hdhomerun from the build. @@ -283,8 +292,14 @@ chmod +x bootstrap %endif --disable-dvdcss \ --disable-optimizations --disable-debug \ +%if %{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="%{?_with_hdhomerun:-lhdhomerun} $LIBS" \ ASFLAGS=-fPIC @@ -356,6 +371,10 @@ fi #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Sun Mar 16 2014 Michael Cronenworth - 13.0-0.6.Gotham_beta2 +- Update to Gotham beta 2 +- use external ffmpeg + * Fri Mar 14 2014 Ken Dreyer - 13.0-0.5.Gotham_beta1 - Update to Gotham beta 1 - Update Goom/MySQL patch, per RHBZ #1069079 -- cgit