diff --git a/.gitignore b/.gitignore index 0543b87..c2e90c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -x264-20081202.tar.bz2 +x264-20081213.tar.bz2 diff --git a/sources b/sources index ce7bdd3..a041898 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4e52e3a3c03e23934bf2ed656fcf26e x264-20081202.tar.bz2 +33addf8e4e1ff4e4b34c8d167aa471ac x264-20081213.tar.bz2 diff --git a/x264-vectors.patch b/x264-vectors.patch deleted file mode 100644 index ceb09fc..0000000 --- a/x264-vectors.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up x264-20081202/common/ppc/ppccommon.h.v x264-20081202/common/ppc/ppccommon.h ---- x264-20081202/common/ppc/ppccommon.h.v 2008-12-02 23:26:25.000000000 +0100 -+++ x264-20081202/common/ppc/ppccommon.h 2008-12-04 01:50:27.000000000 +0100 -@@ -251,7 +251,7 @@ typedef union { - * and i2 - **********************************************************************/ - #define VEC_DIFF_HL(p1,i1,p2,i2,dh,dl) \ -- pix1v = vec_ld(0, p1); \ -+ pix1v = (vec_s16_t)vec_ld(0, p1); \ - temp0v = vec_u8_to_s16_h( pix1v ); \ - temp1v = vec_u8_to_s16_l( pix1v ); \ - VEC_LOAD( p2, pix2v, 16, vec_s16_t, p2); \ diff --git a/x264.spec b/x264.spec index 8285865..a756770 100644 --- a/x264.spec +++ b/x264.spec @@ -1,17 +1,16 @@ -%define snapshot 20081202 -%define git 71d34b4 +%define snapshot 20081213 +%define git 9089d21 Summary: H264/AVC video streams encoder Name: x264 Version: 0.0.0 -Release: 0.19.%{snapshot}git%{git}%{?dist}.1 +Release: 0.20.%{snapshot}git%{git}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2 Source1: x264-snapshot.sh Patch0: %{name}-rpm.patch -Patch1: %{name}-vectors.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: gpac-devel %ifarch x86_64 %{ix86} @@ -53,6 +52,7 @@ This package contains the development files. --prefix=%{_prefix} \\\ --exec-prefix=%{_exec_prefix} \\\ --bindir=%{_bindir} \\\ + --libdir=%{_libdir} \\\ --includedir=%{_includedir} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ --enable-mp4-output \\\ @@ -66,41 +66,18 @@ This package contains the development files. %prep %setup -q -n %{name}-%{snapshot} %patch0 -p1 -b .r -%patch1 -p1 -b .v # AUTHORS file is in iso-8859-1 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS mv -f AUTHORS.utf8 AUTHORS -%ifarch %{ix86} -mkdir sse2 -cp -a `ls -1|grep -v sse2` sse2/ -%endif %build -%{x_configure}\ - --libdir=%{_libdir} \ -%ifarch %{ix86} - --disable-asm -%endif +%{x_configure} %{__make} %{?_smp_mflags} -%ifarch %{ix86} -pushd sse2 -%{x_configure}\ - --libdir=%{_libdir}/sse2 \ - -%{__make} %{?_smp_mflags} -popd -%endif %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install -%ifarch %{ix86} -pushd sse2 -%{__make} DESTDIR=%{buildroot} install -popd -rm %{buildroot}%{_libdir}/sse2/pkgconfig/x264.pc -%endif %clean %{__rm} -rf %{buildroot} @@ -117,9 +94,6 @@ rm %{buildroot}%{_libdir}/sse2/pkgconfig/x264.pc %files libs %defattr(644, root, root, 0755) %{_libdir}/libx264.so.* -%ifarch %{ix86} -%{_libdir}/sse2/libx264.so.* -%endif %files devel %defattr(644, root, root, 0755) @@ -127,11 +101,13 @@ rm %{buildroot}%{_libdir}/sse2/pkgconfig/x264.pc %{_includedir}/x264.h %{_libdir}/libx264.so %{_libdir}/pkgconfig/%{name}.pc -%ifarch %{ix86} -%{_libdir}/sse2/libx264.so -%endif %changelog +* Sat Dec 13 2008 Dominik Mierzejewski 0.0.0-0.20.20081213git9089d21 +- 20081213 snapshot +- drop the libs split on x86, it doesn't work right for P3/AthlonXP +- drop obsolete patch + * Thu Dec 04 2008 Dominik Mierzejewski 0.0.0-0.19.20081202git71d34b4.1 - fix compilation on ppc