[packages/openquicktime] - added gcc patch (fixes inline assembly errors) - added ldconfig - release 4

qboosh qboosh at pld-linux.org
Tue Jul 16 15:37:42 CEST 2013


commit c510b0808848025ed6273b98abe611ec0d4ee1ea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 16 15:37:25 2013 +0200

    - added gcc patch (fixes inline assembly errors)
    - added ldconfig
    - release 4

 openquicktime-gcc.patch | 35 +++++++++++++++++++++++++++++++++++
 openquicktime.spec      | 16 ++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)
---
diff --git a/openquicktime.spec b/openquicktime.spec
index 4fb6560..d3a49cc 100644
--- a/openquicktime.spec
+++ b/openquicktime.spec
@@ -2,13 +2,14 @@ Summary:	Library to load, create, manipulate QuickTime files
 Summary(pl.UTF-8):	Biblioteka do czytania, robienia i modyfikowania plików QuickTime
 Name:		openquicktime
 Version:	1.0
-Release:	3
-License:	LGPL
+Release:	4
+License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/openquicktime/%{name}-%{version}-src.tgz
+Source0:	http://downloads.sourceforge.net/openquicktime/%{name}-%{version}-src.tgz
 # Source0-md5:	f90bc78b8632c6c254cddf70b4726644
 Patch0:		%{name}-types.patch
 Patch1:		%{name}-glib.patch
+Patch2:		%{name}-gcc.patch
 URL:		http://openquicktime.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -45,6 +46,7 @@ Pliki nagłówkowe biblioteki OpenQuicktime.
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -67,10 +69,16 @@ mv -f audioplugin/MP3/README README.MP3
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
-%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/libopenquicktime.so
+%attr(755,root,root) %{_libdir}/quicktime_codec_.mp3.so
+%attr(755,root,root) %{_libdir}/quicktime_codec_jpeg.so
+%attr(755,root,root) %{_libdir}/quicktime_codec_ms.so
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/openquicktime-gcc.patch b/openquicktime-gcc.patch
new file mode 100644
index 0000000..1cc867b
--- /dev/null
+++ b/openquicktime-gcc.patch
@@ -0,0 +1,35 @@
+--- openquicktime-1.0-src/audioplugin/MP3/audioencoder/lame3.70/quantize-pvt.c.orig	2001-07-27 14:53:35.000000000 +0200
++++ openquicktime-1.0-src/audioplugin/MP3/audioencoder/lame3.70/quantize-pvt.c	2013-07-15 21:49:07.191873189 +0200
+@@ -1007,18 +1007,18 @@
+         "dec %4\n\t"
+ 
+         "movl %5, %%eax\n\t"
+-        "movl 4+%5, %%ebx\n\t"
++        "movl 4+%5, %%ecx\n\t"
+         "fxch %%st(1)\n\t"
+         "fadd" F8type " (%2,%%eax," F8size ")\n\t"
+         "fxch %%st(3)\n\t"
+-        "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
++        "fadd" F8type " (%2,%%ecx," F8size ")\n\t"
+ 
+         "movl 8+%5, %%eax\n\t"
+         "movl 12+%5, %%ebx\n\t"
+         "fxch %%st(2)\n\t"
+         "fadd" F8type " (%2,%%eax," F8size ")\n\t"
+         "fxch %%st(1)\n\t"
+-        "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
++        "fadd" F8type " (%2,%%ecx," F8size ")\n\t"
+ 
+         "fxch %%st(3)\n\t"
+         "fistpl -16(%3)\n\t"
+@@ -1029,8 +1029,8 @@
+ 
+         "jnz loop1\n\n"
+         : /* no outputs */
+-        : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
+-        : "%eax", "%ebx", "memory", "cc"
++        : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (*rx)
++        : "%eax", "%ecx", "memory", "cc"
+       );
+   }
+ #elif defined (USE_MSC_ASM)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openquicktime.git/commitdiff/c510b0808848025ed6273b98abe611ec0d4ee1ea



More information about the pld-cvs-commit mailing list