[packages/gavl] - x32 fix from debian-x32.org - rel 2
baggins
baggins at pld-linux.org
Thu Mar 5 18:28:20 CET 2015
commit b3be8f088c8dd8b9b161c8411d17ad46cf2bf7e2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Mar 5 18:28:01 2015 +0100
- x32 fix from debian-x32.org
- rel 2
gavl.spec | 4 +++-
x32.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/gavl.spec b/gavl.spec
index 526b67b..7f2d0f9 100644
--- a/gavl.spec
+++ b/gavl.spec
@@ -6,13 +6,14 @@ Summary: GMerlin Audio Video Library
Summary(pl.UTF-8): Biblioteka audio/video GMerlin
Name: gavl
Version: 1.4.0
-Release: 1
+Release: 2
License: GPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/gmerlin/%{name}-%{version}.tar.gz
# Source0-md5: 2752013a817fbc43ddf13552215ec2c0
Patch0: %{name}-make.patch
Patch1: %{name}-am.patch
+Patch2: x32.patch
URL: http://gmerlin.sourceforge.net/gavl_frame.html
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -57,6 +58,7 @@ Statyczna biblioteka gavl.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..874923c
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,36 @@
+--- gavl-1.4.0.orig/gavl/cputest.c
++++ gavl-1.4.0/gavl/cputest.c
+@@ -69,32 +69,8 @@ int gavl_accel_supported()
+ int rval = 0;
+ int eax, ebx, ecx, edx;
+ int max_std_level, max_ext_level, std_caps=0, ext_caps=0;
+- long a, c;
+-
+- __asm__ __volatile__ (
+- /* See if CPUID instruction is supported ... */
+- /* ... Get copies of EFLAGS into eax and ecx */
+- "pushf\n\t"
+- "pop %0\n\t"
+- "mov %0, %1\n\t"
+-
+- /* ... Toggle the ID bit in one copy and store */
+- /* to the EFLAGS reg */
+- "xor $0x200000, %0\n\t"
+- "push %0\n\t"
+- "popf\n\t"
+-
+- /* ... Get the (hopefully modified) EFLAGS */
+- "pushf\n\t"
+- "pop %0\n\t"
+- : "=a" (a), "=c" (c)
+- :
+- : "cc"
+- );
+-
+- if (a == c)
+- return 0; /* CPUID not supported */
+
++ /* any CPU that can run Debian has CPUID */
+ cpuid(0, max_std_level, ebx, ecx, edx);
+
+ if(max_std_level >= 1){
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gavl.git/commitdiff/b3be8f088c8dd8b9b161c8411d17ad46cf2bf7e2
More information about the pld-cvs-commit
mailing list