rpms/libtheora/devel libtheora-1.0alpha8-textreloc.patch, NONE, 1.1 libtheora.spec, 1.18, 1.19

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libtheora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22444

Modified Files:
	libtheora.spec 
Added Files:
	libtheora-1.0alpha8-textreloc.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
- Fix textrelocations on i386 (bz 253591)


libtheora-1.0alpha8-textreloc.patch:

--- NEW FILE libtheora-1.0alpha8-textreloc.patch ---
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 */


Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtheora.spec	22 Aug 2007 09:39:29 -0000	1.18
+++ libtheora.spec	14 Sep 2007 18:33:29 -0000	1.19
@@ -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 @@
 # 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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 aclocal -I m4
 libtoolize --automake
 autoheader
@@ -101,6 +103,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
+- Fix textrelocations on i386 (bz 253591)
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.2.svn13393
 - Fix Source0 URL