commit f464c528f89fb99472a71a5b0f1130f4fe1f6268
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Jun 1 06:43:21 2017 -0500
Add patch from upstream to fix ppc bug.
mythtv.spec | 9 +++++++--
ticket13049-bswap-guard.diff | 13 +++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 119b561..26f7b2e 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,6 +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
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -787,6 +788,7 @@ on demand content.
#find -name *.pyc -exec rm -f {} \;
%patch0 -p1
+%patch1 -p1
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1353,6 +1355,9 @@ exit 0
%changelog
+* Thu Jun 1 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.28.1-4
+- Add patch from upstream to fix ppc bug.
+
* Mon Apr 24 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.28.1-3
- Update to latest fixes/0.28.
- Exclude ppc64 and ppc64le due to failed builds:
diff --git a/ticket13049-bswap-guard.diff b/ticket13049-bswap-guard.diff
new file mode 100644
index 0000000..ca1ac92
--- /dev/null
+++ b/ticket13049-bswap-guard.diff
@@ -0,0 +1,13 @@
+diff --git a/mythtv/libs/libmythbase/bswap.h b/mythtv/libs/libmythbase/bswap.h
+index ccbe27a..b608641 100644
+--- a/mythtv/libs/libmythbase/bswap.h
++++ b/mythtv/libs/libmythbase/bswap.h
+@@ -25,7 +25,7 @@
+ # error Byte swapping functions not defined for this platform
+ #endif
+
+-#ifdef bswap_32
++#if defined(bswap_32) && !defined(bswap_dbl)
+ // TODO: Any reason we choose not to use bswap_64 for this?
+ static __inline__ double bswap_dbl(double x)
+ {