- Fix textrelocations on i386 (bz 253591)

This commit is contained in:
Hans de Goede 2007-09-14 18:33:29 +00:00
parent 630ee05184
commit bd075e20b9
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,31 @@
diff -up libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c
--- libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~ 2007-09-14 19:27:07.000000000 +0200
+++ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c 2007-09-14 19:27:07.000000000 +0200
@@ -21,6 +21,9 @@
#if defined(USE_ASM)
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
+
static const __attribute__((aligned(8),used)) ogg_int64_t V3= 0x0003000300030003LL;
static const __attribute__((aligned(8),used)) ogg_int64_t V804= 0x0804080408040804LL;
@@ -173,12 +176,17 @@ static void FilterVert__mmx(unsigned cha
);
}
+#endif
+
/* install our implementation in the function table */
void dsp_mmx_dct_decode_init(DspFunctions *funcs)
{
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
TH_DEBUG("enabling accelerated x86_32 mmx dct decode functions.\n");
funcs->FilterVert = FilterVert__mmx;
funcs->FilterHoriz = FilterHoriz__mmx;
+#endif
}
#endif /* USE_ASM */

View File

@ -1,7 +1,7 @@
Summary: Theora Video Compression Codec
Name: libtheora
Version: 1.0alpha8
Release: 0.2.svn13393%{?dist}
Release: 0.3.svn13393%{?dist}
Epoch: 0
License: BSD
Group: System Environment/Libraries
@ -9,6 +9,7 @@ URL: http://www.theora.org
# svn snapshot (svn revision 13393) no url
Source0: %{name}-%{version}.tar.gz
Patch0: libtheora-1.0alpha8-version-info.patch
Patch1: libtheora-1.0alpha8-textreloc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libogg-devel >= 2:1.1
BuildRequires: libvorbis-devel
@ -53,6 +54,7 @@ with theora bitstreams.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
aclocal -I m4
libtoolize --automake
autoheader
@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 1.0alpha8-0.3.svn13393
- Fix textrelocations on i386 (bz 253591)
* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 1.0alpha8-0.2.svn13393
- Fix Source0 URL