Changes of Revision 3
| [-] | Changed | mjpegtools.spec |
|
x 1 2 License: BSD License and BSD-like, GNU General Public License (GPL)3 Group: Productivity/Multimedia/Video/Editors and Convertors4 URL: http://mjpeg.sourceforge.net/5 -Version: 1.8.06 -Release: 387 +Version: 1.9.08 +Release: 409 10 -Source0: mjpegtools-1.8.0.tar.bz211 +Source0: mjpegtools-1.9.0.tar.bz212 13 Patch0: mjpegtools.patch14 Patch1: mjpegtools-cpuinfo.patch15 -Patch2: mjpegtools-libquicktime.patch16 +##Patch2: mjpegtools-libquicktime.patch17 BuildRoot: %{_tmppath}/%{name}-%{version}-build18 BuildRequires: aaa_base19 BuildRequires: SDL-devel20 21 %setup -q22 %patch23 %patch124 -%if %suse_version > 101025 -%patch226 -%endif27 +##%if %suse_version > 101028 +##%patch229 +##%endif30 # overwrite cpuinfo.sh, cpu optimization does not make sense31 # when building for a distribution32 echo "" > cpuinfo.sh33 |
||
| [+] | Changed | mjpegtools-cpuinfo.patch ^ |
| @@ -1,6 +1,6 @@ ---- cpuinfo.sh -+++ cpuinfo.sh -@@ -85,6 +85,7 @@ +--- cpuinfo.sh.orig 2008-11-30 07:30:23.000000000 +0100 ++++ cpuinfo.sh 2009-06-28 22:42:30.000000000 +0200 +@@ -91,6 +91,7 @@ _sse=no _sse2=no _mtrr=no @@ -8,7 +8,7 @@ for i in $pparam ; do case "$i" in -@@ -95,6 +96,7 @@ +@@ -101,6 +102,7 @@ mtrr|k6_mtrr|cyrix_arr) _mtrr=yes ;; xmm|sse|kni) _sse=yes _mmx2=yes ;; sse2) _sse2=yes ;; @@ -16,10 +16,10 @@ esac done -@@ -164,7 +166,12 @@ +@@ -177,7 +179,12 @@ proc=i686 fi - ;; + ;; - 15) proc=pentium4 + 15) + if test "$_longmode" = yes ; then | ||
| [+] | Added | mjpegtools-cpuinfo.patch.old ^ |
| @@ -0,0 +1,32 @@ +--- cpuinfo.sh ++++ cpuinfo.sh +@@ -85,6 +85,7 @@ + _sse=no + _sse2=no + _mtrr=no ++_longmode=no + + for i in $pparam ; do + case "$i" in +@@ -95,6 +96,7 @@ + mtrr|k6_mtrr|cyrix_arr) _mtrr=yes ;; + xmm|sse|kni) _sse=yes _mmx2=yes ;; + sse2) _sse2=yes ;; ++ lm) _longmode=yes ;; + esac + done + +@@ -164,7 +166,12 @@ + proc=i686 + fi + ;; +- 15) proc=pentium4 ++ 15) ++ if test "$_longmode" = yes ; then ++ proc=k8 ++ else ++ proc=pentium4 ++ fi + ;; + *) proc=pentium4 + ;; | ||
| Added | mjpegtools-1.9.0.tar.bz2 ^ | |