[dhewm3] Add ExcludeArch for ppc due to missing ppc_intrinsics.h
by Leigh Scott
commit b7e953ddc5ee6904fd79a17e77fd07e753668a41
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Mar 25 13:19:24 2017 +0000
Add ExcludeArch for ppc due to missing ppc_intrinsics.h
dhewm3.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/dhewm3.spec b/dhewm3.spec
index aace5a8..9de888e 100644
--- a/dhewm3.spec
+++ b/dhewm3.spec
@@ -3,7 +3,7 @@
Name: dhewm3
Version: 1.4.1rc1
-Release: 2.%{?shortcommit0}%{?dist}
+Release: 3.%{?shortcommit0}%{?dist}
Summary: Dhewm's Doom 3 engine
License: GPLv3+ with exceptions
URL: https://github.com/dhewm/%{name}
@@ -16,6 +16,8 @@ Patch0: %{name}-no-cdkey.patch
Patch1: %{name}-def-fixedtic.patch
Patch2: %{name}-carmack.patch
+ExcludeArch: ppc64 ppc64le
+
# Generic provider for Doom 3 engine based games
Provides: doom3-engine = 1.3.1.1304
@@ -75,6 +77,9 @@ fi
%{_libdir}/%{name}
%changelog
+* Sat Mar 25 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.4.1rc1-3.89f227b
+- Add ExcludeArch for ppc due to missing ppc_intrinsics.h
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.4.1rc1-2.89f227b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[libdvbcsa] Fix build
by Nicolas Chauvet
commit 24832e82760a16188530c0be1afc96e578797fd2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Mar 25 13:43:02 2017 +0100
Fix build
libdvbcsa.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libdvbcsa.spec b/libdvbcsa.spec
index e090845..57f1186 100644
--- a/libdvbcsa.spec
+++ b/libdvbcsa.spec
@@ -1,6 +1,6 @@
Name: libdvbcsa
Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: DVB Common Scrambling Algorithm with encryption and decryption capabilities
Group: System Environment/Libraries
@@ -64,6 +64,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Sat Mar 25 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.0-4
+- Disable altivec to fix build
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[libdvbcsa] Disable altivec to fix build on ppc
by Nicolas Chauvet
commit 09cc408b82c1e5efe32f8b0044ea6d946c3ec9ba
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Mar 25 13:42:40 2017 +0100
Disable altivec to fix build on ppc
libdvbcsa.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/libdvbcsa.spec b/libdvbcsa.spec
index 27e9660..e090845 100644
--- a/libdvbcsa.spec
+++ b/libdvbcsa.spec
@@ -37,9 +37,6 @@ developing applications that use %{name}.
%ifarch %{ix86} x86_64
--enable-sse2 --enable-uint64 \
%endif
-%ifarch ppc ppc64
- --enable-altivec \
-%endif
%make_build
7 years, 8 months
[sonic-visualiser-freeworld] libmad moved to fedora - retire freeworld version
by Nicolas Chauvet
commit 51cdbfb9167e47bfaedf73dd9926e05bbb510bdf
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Mar 25 12:08:52 2017 +0100
libmad moved to fedora - retire freeworld version
.gitignore | 2 -
dead.package | 1 +
sonic-visualiser-freeworld.desktop | 9 --
sonic-visualiser-freeworld.spec | 214 -------------------------------------
sources | 1 -
5 files changed, 1 insertion(+), 226 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..aac40ab
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+libmad moved to fedora - retire freeworld version
7 years, 8 months
[tvheadend] Add tvheadend-4.0.9-gcc7.patch
by Martin Gansser
commit 7c43709bc74787b5dad1a0dc8168cfd8f1cefb24
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Mar 25 11:59:29 2017 +0100
Add tvheadend-4.0.9-gcc7.patch
tvheadend-4.0.9-gcc7.patch | 11 +++++++++++
tvheadend.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/tvheadend-4.0.9-gcc7.patch b/tvheadend-4.0.9-gcc7.patch
new file mode 100644
index 0000000..2d64f62
--- /dev/null
+++ b/tvheadend-4.0.9-gcc7.patch
@@ -0,0 +1,11 @@
+--- src/lock.c.orig 2017-03-25 11:24:16.713127102 +0100
++++ src/lock.c 2017-03-25 11:25:07.499462345 +0100
+@@ -36,7 +36,7 @@
+ lck.l_type = lock ? F_WRLCK : F_UNLCK;
+ lck.l_whence = SEEK_SET;
+ lck.l_start = 0;
+- lck.l_len = 11;
++ lck.l_len = 12;
+ lck.l_pid = 0;
+ if (lock) {
+ snprintf(lcktxt, sizeof(lcktxt), "%10li\n", (long)getpid());
diff --git a/tvheadend.spec b/tvheadend.spec
index 96ffb85..3342e4f 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -32,6 +32,7 @@ Patch5: %{name}-4.0.9-service.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
Patch6: %{name}-4.0.9-crypto_policies.patch
+Patch7: %{name}-4.0.9-gcc7.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -80,6 +81,7 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device.
%patch4 -p0 -b .dtv_scan_tables
%patch5 -p0 -b .service
%patch6 -p0 -b .crypto_policies
+%patch7 -p0 -b .gcc7
# Delete bundled system headers
rm -r vendor/{dvb-api,include}/
7 years, 8 months
[tvheadend] Add tvheadend-4.0.9-gcc7.patch
by Martin Gansser
commit b1d7ef8907b48d11c5e98a71165dab1705ca5046
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Mar 25 11:35:33 2017 +0100
Add tvheadend-4.0.9-gcc7.patch
tvheadend.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index b30ccc0..96ffb85 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -145,6 +145,7 @@ exit 0
%changelog
* Sat Mar 25 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 4.0.9-4
- Update to 4.0.9-4
+- Add tvheadend-4.0.9-gcc7.patch
* Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-3
- Merge all FFmpeg patches into a single one
7 years, 8 months
[zboy] Fix FTBFS
by Andrea Musuruane
commit 406244e815c1cd3735b9cb4ea8130de115dafba1
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Mar 25 11:22:56 2017 +0100
Fix FTBFS
zboy.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/zboy.spec b/zboy.spec
index 76a8527..b076989 100644
--- a/zboy.spec
+++ b/zboy.spec
@@ -1,6 +1,6 @@
Name: zboy
Version: 0.60
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A GameBoy emulator
License: GPLv3
@@ -40,7 +40,7 @@ on a LAN.
%patch1 -p0
# Use standard Fedora CFLAGS to compile
-sed -i 's/^CFLAGS = -s -std=gnu89 -O3 -Wall -Wextra -pedantic -Werror=format-security -Wfatal-errors -Wstrict-prototypes/CFLAGS +=/' Makefile.linux
+sed -i 's/^CFLAGS = -s -std=gnu89 -O3 -Wall -Wextra -pedantic -Werror=format-security -Wfatal-errors -Wstrict-prototypes/CFLAGS += -std=gnu89/' Makefile.linux
# Fix end-of-line encoding
for txtfile in license.txt history.txt todo.txt zboy.txt
@@ -51,7 +51,7 @@ done
%build
export CFLAGS="%{optflags}"
-make %{?_smp_mflags} -f Makefile.linux
+%make_build -f Makefile.linux
%install
@@ -66,6 +66,9 @@ install -p -m 0755 %{name} %{buildroot}%{_bindir}
%changelog
+* Sat Mar 25 2017 Andrea Musuruane <musuruan(a)gmail.com> 0.60-4
+- Fix FTBFS
+
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.60-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[tvheadend] Update to 4.0.9-3
by Martin Gansser
commit c0ac54cbbc2f5d1a31d733a919b307a16fb1854a
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Mar 25 10:56:53 2017 +0100
Update to 4.0.9-3
tvheadend.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index d21968f..b30ccc0 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -3,7 +3,7 @@
Name: tvheadend
Version: 4.0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: TV streaming server and digital video recorder
Group: Applications/Multimedia
@@ -143,6 +143,9 @@ exit 0
%changelog
+* Sat Mar 25 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 4.0.9-4
+- Update to 4.0.9-4
+
* Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-3
- Merge all FFmpeg patches into a single one
7 years, 8 months
[tvheadend] Merge all FFmpeg patches into a single one
by Martin Gansser
commit b64be87106a29ab7c287ae892992232bca2bab01
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Mar 25 10:52:57 2017 +0100
Merge all FFmpeg patches into a single one
sources | 2 +-
...g_3.0.patch => tvheadend-4.0.9-ffmpeg_3.0.patch | 26 ++++++++++------------
tvheadend.spec | 17 +++++---------
3 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/sources b/sources
index 769856b..be67fa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d73362985dffdadb5794d306147db58c tvheadend-4.1.tar.gz
+afe45a345151e7ce31db673e0c738e6e tvheadend-4.0.9.tar.gz
diff --git a/tvheadend-4.1-ffmpeg_3.0.patch b/tvheadend-4.0.9-ffmpeg_3.0.patch
similarity index 99%
rename from tvheadend-4.1-ffmpeg_3.0.patch
rename to tvheadend-4.0.9-ffmpeg_3.0.patch
index f28577c..a5c2861 100644
--- a/tvheadend-4.1-ffmpeg_3.0.patch
+++ b/tvheadend-4.0.9-ffmpeg_3.0.patch
@@ -395,29 +395,27 @@ diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
if(opts)
av_dict_free(&opts);
-@@ -1614,16 +1614,19 @@ transcoder_destroy_video(transcoder_t *t
- av_free(vs->vid_octx);
- }
-
-+ if (vs->flt_graph) {
-+ avfilter_graph_free(&vs->flt_graph);
-+ vs->flt_graph = NULL;
-+ }
-+
+@@ -1548,15 +1637,17 @@ transcoder_destroy_video(transcoder_t *t
if(vs->vid_dec_frame)
av_free(vs->vid_dec_frame);
-
+
- if(vs->vid_scaler)
- sws_freeContext(vs->vid_scaler);
-
if(vs->vid_enc_frame)
av_free(vs->vid_enc_frame);
-
- free(ts);
+
+ if (vs->vid_first_pkt)
+ pkt_ref_dec(vs->vid_first_pkt);
+
++ if (vs->flt_graph) {
++ avfilter_graph_free(&vs->flt_graph);
++ vs->flt_graph = NULL;
++ }
+
+ free(ts);
}
-
-
+
@@ -1603,11 +1694,13 @@ transcoder_init_video(transcoder_t *t, s
vs->vid_ictx->thread_count =
vs->vid_octx->thread_count = transcoder_thread_count(t, sct);
diff --git a/tvheadend.spec b/tvheadend.spec
index 3371358..d21968f 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -2,8 +2,8 @@
%global tvheadend_group video
Name: tvheadend
-Version: 4.1
-Release: 1%{?dist}
+Version: 4.0.9
+Release: 3%{?dist}
Summary: TV streaming server and digital video recorder
Group: Applications/Multimedia
@@ -17,8 +17,7 @@ Patch0: %{name}-4.0.9-build.patch
# - https://github.com/tvheadend/tvheadend/commit/c63371c
# - https://github.com/tvheadend/tvheadend/commit/3cbee55
# - https://github.com/tvheadend/tvheadend/commit/374ab83
-###Patch1: %{name}-4.0.9-ffmpeg_3.0.patch
-Patch1: %{name}-4.1-ffmpeg_3.0.patch
+Patch1: %{name}-4.0.9-ffmpeg_3.0.patch
# Use system queue.h header
Patch2: %{name}-4.0.9-use_system_queue.patch
# Fix build with hdhomerun
@@ -76,15 +75,14 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device.
%if 0%{?fedora} >= 24
%patch1 -p0 -b .ffmpeg_3.0
%endif
-#%patch2 -p0 -b .use_system_queue
+%patch2 -p0 -b .use_system_queue
%patch3 -p0 -b .hdhomerun
%patch4 -p0 -b .dtv_scan_tables
%patch5 -p0 -b .service
%patch6 -p0 -b .crypto_policies
# Delete bundled system headers
-#rm -r vendor/{dvb-api,include}/
-rm -r vendor/dvb-api/
+rm -r vendor/{dvb-api,include}/
%build
@@ -145,11 +143,6 @@ exit 0
%changelog
-* Fri Mar 24 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1-1
-- Update to 4.1
-- Remove %%{name}-4.0.9-ffmpeg_3.0.patch
-- Add %%{name}-4.1-ffmpeg_3.0.patch
-
* Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.9-3
- Merge all FFmpeg patches into a single one
7 years, 8 months
[xine-plugin] Sync prcpucfg.h with nspr to fix build on aarch64
by Xavier Bachelot
commit 2868bd1463fb9a96ce03a08cddc02cbd82b21c6e
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Mar 25 10:30:51 2017 +0100
Sync prcpucfg.h with nspr to fix build on aarch64
xine-plugin-1.0.2-Sync_prcpucfg_h_with_nspr.patch | 576 ++++++++++++++++++++++
xine-plugin.spec | 22 +-
2 files changed, 587 insertions(+), 11 deletions(-)
---
diff --git a/xine-plugin-1.0.2-Sync_prcpucfg_h_with_nspr.patch b/xine-plugin-1.0.2-Sync_prcpucfg_h_with_nspr.patch
new file mode 100644
index 0000000..083c199
--- /dev/null
+++ b/xine-plugin-1.0.2-Sync_prcpucfg_h_with_nspr.patch
@@ -0,0 +1,576 @@
+--- include/prcpucfg.h 2007-01-15 14:37:24.000000000 +0100
++++ include/prcpucfg.h 2016-10-20 14:50:51.000000000 +0200
+@@ -1,39 +1,12 @@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS" basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is the Netscape Portable Runtime (NSPR).
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998-2000
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either the GNU General Public License Version 2 or later (the "GPL"), or
+- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable instead
+- * of those above. If you wish to allow use of your version of this file only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the notice
+- * and other provisions required by the GPL or the LGPL. If you do not delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++/*
++ * This file is used by not only Linux but also other glibc systems
++ * such as GNU/Hurd and GNU/k*BSD.
++ */
+
+ #ifndef nspr_cpucfg___
+ #define nspr_cpucfg___
+@@ -42,16 +15,78 @@
+ #define XP_UNIX
+ #endif
+
+-#ifndef LINUX
++#if !defined(LINUX) && defined(__linux__)
+ #define LINUX
+ #endif
+
++#ifdef __FreeBSD_kernel__
++#define PR_AF_INET6 28 /* same as AF_INET6 */
++#elif defined(__GNU__)
++#define PR_AF_INET6 26 /* same as AF_INET6 */
++#else
+ #define PR_AF_INET6 10 /* same as AF_INET6 */
++#endif
+
+-#ifdef __powerpc__
++#ifdef __powerpc64__
++
++#ifdef __LITTLE_ENDIAN__
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
++#else
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#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
++
++#elif defined(__powerpc__)
++
++#ifdef __LITTLE_ENDIAN__
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
++#else
+ #undef IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN 1
++#endif
+
+ #define PR_BYTES_PER_BYTE 1
+ #define PR_BYTES_PER_SHORT 2
+@@ -187,6 +222,53 @@
+
+ #elif defined(__x86_64__)
+
++#ifdef __ILP32__
++
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
++
++#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 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#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 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#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 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#else
++
+ #define IS_LITTLE_ENDIAN 1
+ #undef IS_BIG_ENDIAN
+ #define IS_64
+@@ -231,6 +313,8 @@
+ #define PR_BYTES_PER_WORD_LOG2 3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#endif
++
+ #elif defined(__mc68000__)
+
+ #undef IS_LITTLE_ENDIAN
+@@ -276,6 +360,52 @@
+ #define PR_BYTES_PER_WORD_LOG2 2
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#elif defined(__sparc__) && defined (__arch64__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#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_INT64 8
++#define PR_ALIGN_OF_LONG 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
++
+ #elif defined(__sparc__)
+
+ #undef IS_LITTLE_ENDIAN
+@@ -378,6 +508,52 @@
+ #error "Unknown MIPS endianness."
+ #endif
+
++#if _MIPS_SIM == _ABI64
++
++#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 /* _ABI64 */
++
+ #define PR_BYTES_PER_BYTE 1
+ #define PR_BYTES_PER_SHORT 2
+ #define PR_BYTES_PER_INT 4
+@@ -418,10 +594,19 @@
+ #define PR_BYTES_PER_WORD_LOG2 2
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#endif /* _ABI64 */
++
+ #elif defined(__arm__)
+
++#ifdef __ARMEB__
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#elif defined(__ARMEL__)
+ #define IS_LITTLE_ENDIAN 1
+ #undef IS_BIG_ENDIAN
++#else
++#error "Unknown ARM endianness."
++#endif
+
+ #define PR_BYTES_PER_BYTE 1
+ #define PR_BYTES_PER_SHORT 2
+@@ -463,6 +648,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
++
+ #elif defined(__hppa__)
+
+ #undef IS_LITTLE_ENDIAN
+@@ -599,13 +837,195 @@
+ #define PR_BYTES_PER_WORD_LOG2 2
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#elif defined(__sh__)
++
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
++
++#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 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#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 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#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 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 4
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#elif defined(__avr32__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++
++#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 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#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 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#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 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 4
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#elif defined(__m32r__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++
++#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 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#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 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#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 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 4
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#elif defined(__or1k__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++
++#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 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#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 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#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 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 4
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
+ #else
+
+ #error "Unknown CPU architecture"
+
+ #endif
+
++#ifndef HAVE_LONG_LONG
+ #define HAVE_LONG_LONG
++#endif
+ #if PR_ALIGN_OF_DOUBLE == 8
+ #define HAVE_ALIGNED_DOUBLES
+ #endif
diff --git a/xine-plugin.spec b/xine-plugin.spec
index 6005771..ca4ae89 100644
--- a/xine-plugin.spec
+++ b/xine-plugin.spec
@@ -1,13 +1,13 @@
Name: xine-plugin
Version: 1.0.2
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Mozilla/Netscape compatible media plugin
Group: Applications/Multimedia
License: GPLv2+
URL: http://xinehq.de/
Source0: http://prdownloads.sourceforge.net/xine/xine-plugin-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-plugin-1.0.2-Sync_prcpucfg_h_with_nspr.patch
BuildRequires: xine-lib-devel
BuildRequires: pkgconfig
@@ -35,29 +35,29 @@ Features:
%prep
%setup -q
+%patch0 -p0
%build
%configure --with-plugindir=%{_libdir}/mozilla/plugins
-make %{?_smp_mflags}
+%make_build
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
rm -rf $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins/*.la
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
%{_libdir}/mozilla/plugins/*
%changelog
+* Sat Mar 25 2017 Xavier Bachelot <xavier(a)bachelot.org> - 1.0.2-12
+- Sync prcpucfg.h with nspr to fix build on aarch64.
+- Cleanup specfile.
+
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.0.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
