[Momonga-devel.ja:03469] mjpegtools
- From: Kiyofumi Takayoshi <takayosi@xxxxxxxxxxxxxxxxx>
- Date: Fri, 06 Apr 2007 21:51:11 +0900
maxwelと申します。
Core2Duo(x86_64)でmjpegtools-1.9がコンパイルできないので1.8にならって
パッチを作りました。
*** cpuinfo.sh.EM64T Tue Feb 27 02:05:38 2007
--- cpuinfo.sh Mon Apr 2 12:18:45 2007
***************
*** 162,168 ****
fi
;;
6) iproc=686
! if test "$pmodel" -ge 13; then
proc=pentium-m
elif test "$pmodel" -ge 7; then
proc=pentium3
--- 162,170 ----
fi
;;
6) iproc=686
! if test "$pmodel" -ge 15; then
! proc=nocona
! elif test "$pmodel" -ge 13; then
proc=pentium-m
elif test "$pmodel" -ge 7; then
proc=pentium3
***************
*** 173,178 ****
--- 175,185 ----
fi
;;
15) proc=pentium4
+ if test "$pmodel" -ge 4; then
+ proc=nocona
+ else
+ proc=i686
+ fi
;;
*) proc=pentium4
;;
*** mjpegtools.spec.old Fri Apr 6 21:26:46 2007
--- mjpegtools.spec Fri Apr 6 21:30:03 2007
***************
*** 19,25 ****
Patch5: libmovtar-0.1.3-gcc4.patch
#Patch6: mjpegtools-1.6.2-unsigned_long_long.patch
Patch7: movtar.m4.patch
! Patch8: mjpegtools-1.8.0-EM64T.patch
Patch100: mjpegtools-1.8.0-fix_constraint_in_inline_asm.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: SDL-devel >= 1.2.7-11m, arts-devel, esound-devel
--- 19,25 ----
Patch5: libmovtar-0.1.3-gcc4.patch
#Patch6: mjpegtools-1.6.2-unsigned_long_long.patch
Patch7: movtar.m4.patch
! Patch8: mjpegtools-1.9.0-EM64T.patch
Patch100: mjpegtools-1.8.0-fix_constraint_in_inline_asm.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: SDL-devel >= 1.2.7-11m, arts-devel, esound-devel
***************
*** 54,60 ****
%patch4 -p0 -b .gcc34
%patch5 -p0 -b .gcc4
%ifarch x86_64
! %patch8 -p1 -b .EM64T
%endif
mv quicktime4linux-* quicktime4linux
--- 54,60 ----
%patch4 -p0 -b .gcc34
%patch5 -p0 -b .gcc4
%ifarch x86_64
! %patch8 -p0 -b .EM64T
%endif
mv quicktime4linux-* quicktime4linux