diff --git a/dont-play-with-cflags-on-aarch64.patch b/dont-play-with-cflags-on-aarch64.patch deleted file mode 100644 index ee0894e..0000000 --- a/dont-play-with-cflags-on-aarch64.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: x264-0.142-20141221-6a301b6/configure -=================================================================== ---- x264-0.142-20141221-6a301b6.orig/configure -+++ x264-0.142-20141221-6a301b6/configure -@@ -788,9 +788,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then - fi - - if [ $asm = auto -a $ARCH = AARCH64 ] ; then -- # set flags so neon is built by default -- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon" -- - if cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON - ASFLAGS="$ASFLAGS -c" - else diff --git a/x264-nover.patch b/x264-nover.patch index 286bda2..f0a3806 100644 --- a/x264-nover.patch +++ b/x264-nover.patch @@ -1,11 +1,11 @@ ---- ./configure.nover 2012-11-18 05:31:06.000000000 +0000 -+++ ./configure 2012-11-19 01:44:23.790190057 +0000 -@@ -1147,7 +1147,7 @@ fi - echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak - echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak +--- ./configure.orig 2015-10-21 19:24:34.933238254 +0100 ++++ ./configure 2015-10-21 19:25:53.907124640 +0100 +@@ -1236,7 +1236,7 @@ cat > x264_config.h << EOF + #define X264_CHROMA_FORMAT $config_chroma_format + EOF --${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h +-${SRCPATH}/version.sh >> x264_config.h +cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h - cat > x264.pc << EOF - prefix=$prefix + if [ "$cli_libx264" = "system" ] ; then + if [ "$shared" = "yes" ]; then diff --git a/x264.spec b/x264.spec index 8ed002b..fb9a719 100644 --- a/x264.spec +++ b/x264.spec @@ -1,7 +1,7 @@ -# globals for x264-0.144-20150225-c8a773e.tar.bz2 -%global api 144 -%global gitdate 20150225 -%global gitversion c8a773e +# globals for x264-0.148-20151020-a0cd7d3.tar.bz2 +%global api 148 +%global gitdate 20151020 +%global gitversion a0cd7d3 %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable @@ -17,6 +17,9 @@ %ifnarch x86_64 i686 %{arm} ppc ppc64 %{sparc} aarch64 %global _without_asm 1 %endif +#ifarch i686 armv5tel armv6l +#global _without_asm 1 +#endif %if 0%{?rhel} %global _without_asm 1 @@ -37,9 +40,6 @@ BuildRequires: perl-Digest-MD5 Patch0: x264-nover.patch Patch10: x264-gpac.patch -# NEON is not optional in AArch64 cpus so no need to play with cflags -Patch11: dont-play-with-cflags-on-aarch64.patch - %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel} %{!?_without_libavformat:BuildRequires: ffmpeg-devel} %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} @@ -94,7 +94,6 @@ This package contains the development files. pushd %{name}-0.%{api}-%{snapshot} %patch0 -p1 -b .nover %patch10 -p1 -b .gpac -%patch11 -p1 popd variants="generic generic10" @@ -112,9 +111,6 @@ pushd generic %{x_configure}\ --host=%{_target_platform} \ --libdir=%{_libdir} \ -%ifarch i686 armv5tel armv6l - --disable-asm \ -%endif %{__make} %{?_smp_mflags} popd @@ -133,9 +129,6 @@ pushd generic10 %{x_configure}\ --host=%{_target_platform} \ --libdir=%{_libdir} \ -%ifarch i686 armv5tel armv6l - --disable-asm \ -%endif --bit-depth=10 sed -i -e "s/SONAME=libx264.so./SONAME=libx26410b.so./" config.mak @@ -194,6 +187,9 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl %{_libdir}/libx26410b.so %changelog +* Wed Oct 21 2015 Sérgio Basto - 0.148-1.20151020gita0cd7d3 +- Update to x264-0.148, soname bump, git a0cd7d3, date 20151020 . + * Sat Jun 06 2015 Sérgio Basto - 0.144-1.20150225gitc8a773e - Update to x264-0.144, soname bump, git c8a773e from date 20150225 .