[packages/tvtime] - added x32 patch; dropped EA (non-x86 are supported too, some even use optimized code)

qboosh qboosh at pld-linux.org
Mon Jul 4 20:36:59 CEST 2016


commit 7db4f2c2eb60bb6d50ff5bcabfe8c06bc6965fc0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jul 4 20:37:06 2016 +0200

    - added x32 patch; dropped EA (non-x86 are supported too, some even use optimized code)

 tvtime-x32.patch | 21 +++++++++++++++++++++
 tvtime.spec      | 15 +++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
---
diff --git a/tvtime.spec b/tvtime.spec
index 0f51779..baffcf3 100644
--- a/tvtime.spec
+++ b/tvtime.spec
@@ -9,14 +9,17 @@ Source0:	https://linuxtv.org/downloads/tvtime/%{name}-%{version}.tar.gz
 # Source0-md5:	97a09d1723c073eb2b8bea48a148a994
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-autodetect_textured_overlay.patch
+Patch2:		%{name}-x32.patch
 URL:		http://tvtime.sourceforge.net/
 BuildRequires:	alsa-lib-devel >= 1.0.9
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.52
+BuildRequires:	automake >= 1.6
 BuildRequires:	freetype-devel >= 2
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	gettext-tools
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	xorg-lib-libX11-devel
@@ -27,8 +30,6 @@ BuildRequires:	xorg-lib-libXv-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	zlib-devel
 Requires:	alsa-lib >= 1.0.9
-# ?
-ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fomit-frame-pointer
@@ -51,9 +52,15 @@ wysokiej jakości obrazu, co czyni go idealnym dla wideofili.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-silent-rules
 %{__make}
diff --git a/tvtime-x32.patch b/tvtime-x32.patch
new file mode 100644
index 0000000..6ebc4ca
--- /dev/null
+++ b/tvtime-x32.patch
@@ -0,0 +1,21 @@
+--- tvtime-1.0.10/src/speedy.c.orig	2016-02-24 10:56:25.000000000 +0100
++++ tvtime-1.0.10/src/speedy.c	2016-07-04 20:30:52.212076878 +0200
+@@ -547,7 +547,7 @@
+ #ifdef ARCH_X86
+ static void convert_uyvy_to_yuyv_scanline_mmx( uint8_t *uyvy_buf, uint8_t *yuyv_buf, int width )
+ {
+-#ifdef ARCH_386
++#if defined(ARCH_386) || defined(__ILP32__)
+     __asm__ __volatile__(
+         "   movl      %0, %%esi         \n"
+         "   movl      %1, %%edi         \n"
+@@ -575,8 +575,7 @@
+         /* output */            :
+         /* input */             : "g" (uyvy_buf), "g" (yuyv_buf), "g" (width)
+         /* clobber registers */ : "cc", "edx", "esi", "edi" );
+-#endif
+-#ifdef ARCH_X86_64
++#elif defined(ARCH_X86_64)
+     __asm__ __volatile__(
+         "   movq      %0, %%rsi         \n"
+         "   movq      %1, %%rdi         \n"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tvtime.git/commitdiff/7db4f2c2eb60bb6d50ff5bcabfe8c06bc6965fc0



More information about the pld-cvs-commit mailing list