commit 2c7c2043e773015817ff34c7d2f1a9d05ccd6202 Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Fri Jun 2 07:32:23 2017 -0500 Add patch from upstream to fix ppc bug. mythtv.spec | 9 ++++++--- ticket13049-remove-ffmpeg-bswap-change.diff | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) --- diff --git a/mythtv.spec b/mythtv.spec index dbb8b3f..7d91398 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -1,6 +1,6 @@ # Does not currently build on ppc # https://code.mythtv.org/trac/ticket/13049 -ExcludeArch: ppc64 ppc64le +#ExcludeArch: ppc64 ppc64le # Specfile for building MythTV and MythPlugins RPMs from a git checkout. # @@ -85,7 +85,7 @@ Version: 0.28.1 %if "%{branch}" == "master" Release: 0.5.git.%{_gitrev}%{?dist} %else -Release: 3%{?dist} +Release: 4%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -137,7 +137,7 @@ Source0: https://github.com/MythTV/%{name}/archive/v%{version}.tar.gz#/%{name} # Also update ChangeLog with git log v0.28..HEAD > ChangeLog # and update define vers_string to v0.28-52-ge6a60f7 with git describe Patch0: mythtv-0.28-fixes.patch -Patch1: ticket13049-bswap-guard.diff +Patch1: ticket13049-remove-ffmpeg-bswap-change.diff Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -1355,6 +1355,9 @@ exit 0 %changelog +* Thu Jun 1 2017 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.28.1-4 +- Add patch from upstream to fix ppc bug. + * Mon Apr 24 2017 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.28.1-3 - Update to latest fixes/0.28. - Exclude ppc64 and ppc64le due to failed builds: diff --git a/ticket13049-remove-ffmpeg-bswap-change.diff b/ticket13049-remove-ffmpeg-bswap-change.diff new file mode 100644 index 0000000..0c4a274 --- /dev/null +++ b/ticket13049-remove-ffmpeg-bswap-change.diff @@ -0,0 +1,26 @@ +diff --git a/mythtv/external/FFmpeg/libavutil/bswap.h b/mythtv/external/FFmpeg/libavutil/bswap.h +index 331d391..91cb795 100644 +--- a/mythtv/external/FFmpeg/libavutil/bswap.h ++++ b/mythtv/external/FFmpeg/libavutil/bswap.h +@@ -76,21 +76,6 @@ static inline uint64_t av_const av_bswap64(uint64_t x) + } + #endif + +-#ifndef av_bswap_dbl +-static inline double bswap_dbl(double x) +-{ +- union { +- uint32_t l[2]; +- double d; +- } w, r; +- w.d = x; +- r.l[0] = av_bswap32(w.l[1]); +- r.l[1] = av_bswap32(w.l[0]); +- return r.d; +-} +-#endif +- +- + // be2ne ... big-endian to native-endian + // le2ne ... little-endian to native-endian +