diff options
author | Michael Cronenworth <mike@cchtml.com> | 2014-08-06 00:37:22 -0500 |
---|---|---|
committer | Michael Cronenworth <mike@cchtml.com> | 2014-08-06 00:37:22 -0500 |
commit | dff90fa75c710ac52497f57945563c00138d5693 (patch) | |
tree | 36d356b705ce079d1f1f7a4280908f01248cc6c0 | |
parent | 9e131e835196edf33fdb951afbe2dcc1b41832a4 (diff) | |
download | xbmc-rpm-dff90fa75c710ac52497f57945563c00138d5693.tar.gz xbmc-rpm-dff90fa75c710ac52497f57945563c00138d5693.tar.xz xbmc-rpm-dff90fa75c710ac52497f57945563c00138d5693.zip |
Update external ffmpeg patch
Thanks for breaking configure so late in the game, XBMC.
-rw-r--r-- | 0001-Revert-drop-support-for-external-ffmpeg.patch | 10 | ||||
-rw-r--r-- | xbmc.spec | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/0001-Revert-drop-support-for-external-ffmpeg.patch b/0001-Revert-drop-support-for-external-ffmpeg.patch index d0920b3..502f97a 100644 --- a/0001-Revert-drop-support-for-external-ffmpeg.patch +++ b/0001-Revert-drop-support-for-external-ffmpeg.patch @@ -15,7 +15,7 @@ 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. +@@ -191,6 +191,9 @@ # External library message strings external_libraries_enabled="== Use of all supported external libraries enabled. ==" external_libraries_disabled="== Use of all supported external libraries disabled. ==" @@ -25,7 +25,7 @@ index f9f5693..c389b76 100644 dashes="------------------------" final_message="\n XBMC Configuration:" final_message="\n$dashes$final_message\n$dashes" -@@ -569,6 +572,12 @@ AC_ARG_ENABLE([external-libraries], +@@ -569,6 +572,12 @@ [use_external_libraries=$enableval], [use_external_libraries=no]) @@ -38,9 +38,9 @@ index f9f5693..c389b76 100644 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}" +@@ -602,9 +611,6 @@ + READELF="${READELF:-readelf}" + NM="${NM:-nm}" -use_external_ffmpeg=no -use_static_ffmpeg=no @@ -7,7 +7,7 @@ Name: xbmc Version: 13.2 -Release: 0.2.beta3%{?dist} +Release: 0.3.beta3%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ @@ -390,6 +390,9 @@ fi %changelog +* Wed Aug 06 2014 Michael Cronenworth <mike@cchtml.com> - 13.2-0.3.beta3 +- Update external ffmpeg patch + * Tue Aug 05 2014 Michael Cronenworth <mike@cchtml.com> - 13.2-0.2.beta3 - Update to 13.2 beta 3 - Drop upstream patches |