Update to 20200222git

el9
leigh123linux 5 years ago
parent 2d963e6f0c
commit 02dd402ab5

1
.gitignore vendored

@ -4,3 +4,4 @@ ffmpeg-*.rpm
/ffmpeg-20180211.tar.bz2
/ffmpeg-20180305.tar.bz2
/ffmpeg-20180419.tar.bz2
/ffmpeg-20200222.tar.bz2

@ -15,7 +15,7 @@ pwd=$(pwd)
date=$(date +%Y%m%d)
pushd "$tmp"
git clone git://git.videolan.org/ffmpeg.git
git clone git://git.ffmpeg.org/ffmpeg.git
cd ffmpeg
git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
popd

@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
#global date 20180419
%global date 20200222
#global rel rc1
# Cuda and others are only available on some arches
@ -82,8 +82,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.2
Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
Version: 4.3
Release: 0.1.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@ -91,7 +91,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix_ppc_build.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@ -320,7 +319,6 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@ -427,6 +425,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
* Sat Feb 22 2020 Leigh Scott <leigh123linux@googlemail.com> - 4.3-0.1.20200222git
- Update to 20200222git
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 4.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

@ -1,21 +0,0 @@
--- a/libswscale/ppc/swscale_vsx.c
+++ b/libswscale/ppc/swscale_vsx.c
@@ -154,7 +154,7 @@
}
}
-static void yuv2plane1_nbps_vsx(const int16_t *src, uint16_t *dest, int dstW,
+static av_always_inline void yuv2plane1_nbps_vsx(const int16_t *src, uint16_t *dest, int dstW,
int big_endian, int output_bits)
{
const int dst_u = -(uintptr_t)dest & 7;
@@ -273,7 +273,7 @@
}
}
-static void yuv2plane1_16_vsx(const int32_t *src, uint16_t *dest, int dstW,
+static av_always_inline void yuv2plane1_16_vsx(const int32_t *src, uint16_t *dest, int dstW,
int big_endian, int output_bits)
{
const int dst_u = -(uintptr_t)dest & 7;

@ -1 +1 @@
SHA512 (ffmpeg-4.2.2.tar.xz) = 381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3
SHA512 (ffmpeg-20200222.tar.bz2) = 2a31ecffb01046d9520b86907024dbbcd4b7430bcf9988891b800230c9cb8e5391a7fe5d36d633dada1f5510068556d16ebb73ea6e7cdc07557b63699e736f7b

Loading…
Cancel
Save