[kmplayer] Fix FTBFS on aarch64 (#1113337)

Rex Dieter rdieter at fedoraproject.org
Sat Jun 28 14:31:08 UTC 2014


commit 6d9ddf1f1143eedb68a5e8eee56121c63b036d37
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Wed Jun 25 20:45:20 2014 -0500

    Fix FTBFS on aarch64 (#1113337)

 kmplayer-0.11.3c-aarch64.patch |   64 ++++++++++++++++++++++++++++++++++++++++
 kmplayer.spec                  |    7 ++++-
 2 files changed, 70 insertions(+), 1 deletions(-)
---
diff --git a/kmplayer-0.11.3c-aarch64.patch b/kmplayer-0.11.3c-aarch64.patch
new file mode 100644
index 0000000..3fd1324
--- /dev/null
+++ b/kmplayer-0.11.3c-aarch64.patch
@@ -0,0 +1,64 @@
+diff --git a/src/moz-sdk/prcpucfg.h b/src/moz-sdk/prcpucfg.h
+index 88ae110..e47dd22 100644
+--- a/src/moz-sdk/prcpucfg.h
++++ b/src/moz-sdk/prcpucfg.h
+@@ -759,6 +759,59 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(__aarch64__)
++
++#ifdef __AARCH64EB__
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#elif defined(__AARCH64EL__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#else
++#error "Unknown Aarch64 endianness."
++#endif
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2   3
++#define PR_BYTES_PER_DWORD_LOG2  3
++
+ #else
+ 
+ #error "Unknown CPU architecture"
diff --git a/kmplayer.spec b/kmplayer.spec
index 5454b0a..25b4527 100644
--- a/kmplayer.spec
+++ b/kmplayer.spec
@@ -1,7 +1,7 @@
 Name:    kmplayer
 Summary: A simple front-end for MPlayer/FFMpeg/Phonon
 Version: 0.11.3c
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   Applications/Multimedia
 # The documentation is GFDL.
 # The files under src/moz-sdk are MPLv1.1 or GPLv2+ or LGPLv2+
@@ -22,6 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # default to using phonon (instead of mplayer)
 # Put this into kde-settings instead? -- Rex
 Patch0: kmplayer-0.11.0a-kmplayerrc_phonon_default.patch
+Patch1: kmplayer-0.11.3c-aarch64.patch
 
 ## upstream patches
 
@@ -47,6 +48,7 @@ on a movie file, the movie is played inside Konqueror.
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 %patch0 -p1 -b .kmplayerrc_phonon_default
+%patch1 -p1 -b .aarch64
 
 
 %build
@@ -102,6 +104,9 @@ update-desktop-database -q &> /dev/null || :
 
 
 %changelog
+* Thu Jun 26 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.11.3c-6
+- Fix FTBFS on aarch64 (#1113337)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.3c-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list