Compare commits

...

No commits in common. 'el9' and 'i8cr' have entirely different histories.
el9 ... i8cr

20
.gitignore vendored

@ -1,19 +1 @@
x264-0.144-20150225-c8a773e.tar.bz2
x264-0.148-20160118-5c65704.tar.bz2
/x264-0.148-20160614-a5e06b9.tar.bz2
/x264-0.148-20160924-86b7198.tar.bz2
/x264-0.148-20161201-4d5c8b0.tar.bz2
/x264-0.148-20170121-97eaef2.tar.bz2
/x264-0.148-20170519-d32d7bf.tar.bz2
/x264-0.148-20170521-aaa9aa8.tar.bz2
/x264-0.152-20171224-e9a5903.tar.bz2
/x264-0.155-20180806-0a84d98.tar.bz2
/x264-0.157-20190303-72db437.tar.bz2
/x264-0.157-20190717-34c06d1.tar.bz2
/x264-0.159-20191127git1771b55.tar.bz2
/x264-0.159-20200409git296494a.tar.bz2
/x264-0.160-20200702gitcde9a93.tar.bz2
/x264-0.161-20200912gitd198931.tar.bz2
/x264-0.161-20210124git544c61f.tar.bz2
/x264-0.161-20210412git55d517b.tar.bz2
/x264-0.163-20210613git5db6aa6.tar.bz2
SOURCES/x264-0.157-20190717-34c06d1.tar.bz2

@ -0,0 +1 @@
e235dfade1bc137a4fabe93f42ad8f4fa1aad4fd SOURCES/x264-0.157-20190717-34c06d1.tar.bz2

@ -0,0 +1,13 @@
--- ./configure.orig 2019-03-12 00:41:42.000000000 +0000
+++ ./configure 2019-03-12 01:10:12.603640526 +0000
@@ -1207,7 +1207,9 @@ fi
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
GPAC_LIBS="-lgpac_static"
- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
+ for lib in -lz -lssl -lcrypto -lpng -ljpeg; do
+ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
+ done
if [ "$SYS" = "WINDOWS" ] ; then
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"

@ -0,0 +1,11 @@
--- ./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 >> x264_config.h
+cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
if [ "$cli_libx264" = "system" ] ; then
if [ "$shared" = "yes" ]; then

@ -0,0 +1,39 @@
#!/bin/bash
set -e
#tmp=$(mktemp -d)
tmp=./__tmp
#trap cleanup EXIT
#cleanup() {
# set +e
# [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
#}
unset CDPATH
pwd=$(pwd)
package=x264
branch=stable
#commit=HEAD
commit=34c06d1
pushd "$tmp"
git clone https://code.videolan.org/videolan/x264.git -b ${branch}
cd ${package}
tag=$(git rev-list 34c06d1 -n 1 | cut -c 1-7)
git checkout ${commit}
git checkout -b rpmfusion
./version.sh > version.h
API="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"
date=$(git log -1 --format=%cd --date=short | tr -d \-)
git add version.h
git commit -m "generated version.h" version.h
git archive --prefix="${package}-0.$API-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}-${tag}.tar.bz2
popd >/dev/null
echo \# globals for x264-0.$API-$date-$tag.tar.bz2
echo %global api $API
echo %global gitdate ${date}
echo %global gitversion ${tag}

@ -1,9 +1,9 @@
# globals for x264-0.163-20210613git5db6aa6.tar.bz2
%global api 163
%global gitdate 20210613
%global gitversion 5db6aa6
# globals for x264-0.157-20190717-34c06d1.tar.bz2
%global api 157
%global gitdate 20190717
%global gitversion 34c06d1
%global snapshot %{gitdate}git%{gitversion}
%global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion}
%global branch stable
@ -14,26 +14,24 @@
%global _without_libavformat 1
%global _without_libswscale 1
}
# Reduce dependencies to build x264-libs on i686
%if 0%{?fedora}
%ifarch i686
%global _without_gpac 1
%global _without_libavformat 1
%global _without_libswscale 1
%endif
%endif
#Whitelist of arches with dedicated ASM code
%global asmarch aarch64 armv7hl armv7hnl i686 ppc64 ppc64le x86_64
%global asmarch x86_64 armv7hl armv7hnl ppc64le aarch64
# list of arches where ASM must be optional
%global simdarch i686 ppc64
%ifnarch %{asmarch}
%global _without_asm 1
%endif
%ifarch i686
%global slibdir %{_libdir}/sse2
%endif
%ifarch ppc64
%global slibdir %{_libdir}/altivec
%endif
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@ -43,17 +41,18 @@ Source1: x264-snapshot.sh
Patch0: x264-nover.patch
# add 10b suffix to high bit depth build
Patch1: x264-10b.patch
Patch10: x264-gpac.patch
Patch11: x264-opencl.patch
BuildRequires: gcc
%{!?_without_gpac:BuildRequires: gpac-static >= 1.0.1 zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel libglvnd-devel mesa-libGLU-devel faad2-devel libmad-devel xvidcore-devel a52dec-devel libvorbis-devel libtheora-devel openjpeg2-devel }
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
%ifarch armv7hl armv7hnl
BuildRequires: execstack
%endif
%ifarch %{asmarch}
%ifarch %{asmarch} %{simdarch}
BuildRequires: nasm
%endif
# we need to enforce the exact EVR for an ISA - not only the same ABI
@ -85,13 +84,7 @@ scratch.
This package contains the development files.
%global x_configure \
./configure \\\
--host=%{_host} \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
--bindir=%{_bindir} \\\
--includedir=%{_includedir} \\\
--libdir=%{_libdir} \\\
%configure \\\
%{?_without_libavformat:--disable-lavf} \\\
%{?_without_libswscale:--disable-swscale} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
@ -105,22 +98,26 @@ This package contains the development files.
pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover
%patch1 -p1 -b .10b
%patch10 -p1 -b .gpac
%patch11 -p1 -b .opencl
popd
for variant in generic generic10 ; do
variants="generic generic10"
%ifarch %{simdarch}
variants="$variants simd simd10"
%endif
for variant in $variants ; do
rm -rf ${variant}
cp -pr %{name}-0.%{api}-%{snapshot} ${variant}
done
%build
%set_build_flags
pushd generic
%{x_configure}\
%{?_without_asm:--disable-asm}
%make_build
%{__make} %{?_smp_mflags}
popd
pushd generic10
@ -130,9 +127,28 @@ pushd generic10
--disable-opencl \
--bit-depth=10
%make_build
%{__make} %{?_smp_mflags}
popd
%ifarch %{simdarch}
pushd simd
%{x_configure}\
--libdir=%{slibdir}
%{__make} %{?_smp_mflags}
popd
pushd simd10
%{x_configure}\
--disable-cli\
--libdir=%{slibdir}\
--disable-opencl \
--bit-depth=10
%{__make} %{?_smp_mflags}
popd
%endif
%install
# NOTE: the order is important here! We want the generic devel stuff
for variant in generic10 generic ; do
@ -140,6 +156,14 @@ pushd ${variant}
%make_install
popd
done
%ifarch %{simdarch}
for variant in simd10 simd ; do
pushd ${variant}
%make_install
rm %{buildroot}%{slibdir}/pkgconfig/x264.pc
popd
done
%endif
#Fix timestamp on x264 generated headers
touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
@ -152,9 +176,9 @@ execstack -c %{buildroot}%{_libdir}/libx264{,10b}.so.%{api}
install -dm755 %{buildroot}%{_pkgdocdir}
install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%post libs -p /sbin/ldconfig
%ldconfig_scriptlets libs
%postun libs -p /sbin/ldconfig
%files
%{_bindir}/x264
@ -165,6 +189,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%license %{_pkgdocdir}/COPYING
%{_libdir}/libx264.so.%{api}
%{_libdir}/libx26410b.so.%{api}
%ifarch %{simdarch}
%{slibdir}/libx264.so.%{api}
%{slibdir}/libx26410b.so.%{api}
%endif
%files devel
%doc generic/doc/*
@ -173,85 +201,14 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%{_libdir}/libx264.so
%{_libdir}/libx26410b.so
%{_libdir}/pkgconfig/%{name}.pc
%ifarch %{simdarch}
%{slibdir}/libx264.so
%{slibdir}/libx26410b.so
%endif
%changelog
* Sat Mar 05 2022 Sérgio Basto <sergio@serjux.com> - 0.163-6.20210613git5db6aa6
- Rebuild for new gpac on F36
* Sat Feb 26 2022 Leigh Scott <leigh123linux@gmail.com> - 0.163-5.20210613git5db6aa6
- Rebuild for new gpac
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 0.163-4.20210613git5db6aa6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 09 2021 Leigh Scott <leigh123linux@gmail.com> - 0.163-3.20210613git5db6aa6
- Rebuilt for new ffmpeg snapshot
* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.163-2.20210613git5db6aa6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jun 14 2021 Sérgio Basto <sergio@serjux.com> - 0.163-1.20210613git5db6aa6
- x264-0.163-20210613git5db6aa6 soname bump
- gpac patch accepted upstream with modifications
* Tue Apr 13 2021 Sérgio Basto <sergio@serjux.com> - 0.161-6.20210412git55d517b
- Update to x264-0.161-20210412git55d517b (stable branch)
* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.161-5.20210124git544c61f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Jan 24 2021 Sérgio Basto <sergio@serjux.com> - 0.161-4.20210124git544c61f
- Update to 0.161-20210124git544c61f (stable branch)
* Tue Jan 19 2021 Dominik Mierzejewski <rpm@greysector.net> - 0.161-3.20200912gitd198931
- Drop non-asm build for i686 and ppc64 (rfbz#5855)
- Use set_build_flags instead of configure macro for non-autotools script (rfbz#5854)
* Thu Dec 31 2020 Leigh Scott <leigh123linux@gmail.com> - 0.161-2.20200912gitd198931
- Rebuilt for new ffmpeg snapshot
* Wed Nov 18 2020 Sérgio Basto <sergio@serjux.com> - 0.161-1.20200912gitd198931
- Update x264 to api 0.161 (stable branch)
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.160-2.20200702gitcde9a93
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 06 2020 Sérgio Basto <sergio@serjux.com> - 0.160-1.20200702gitcde9a93
- Update to 0.160-20200702gitcde9a93 (stable branch)
* Mon Jul 06 2020 Nicolas Chauvet <kwizart@gmail.com> - 0.159-11.20200409git296494a
- Bump
* Mon Jul 06 2020 Sérgio Basto <sergio@serjux.com> - 0.159-10.20200409git296494a
- Fix detection of gpac try 2
* Mon Jul 06 2020 Sérgio Basto <sergio@serjux.com> - 0.159-9.20200409git296494a
- Fix detection of gpac
* Wed Jun 10 2020 Sérgio Basto <sergio@serjux.com> - 0.159-8.20200409git296494a
- Update to 0.159-20200409git296494a (stable branch)
- Replace all __make _smp_mflags by make_build macro
* Thu Mar 12 2020 Leigh Scott <leigh123linux@gmail.com> - 0.159-7.20191127git1771b55
- Rebuilt for i686
* Wed Mar 11 2020 Nicolas Chauvet <kwizart@gmail.com> - 0.159-6.20191127git1771b55_bootstrap
- bootstrap for i686
* Sat Feb 22 2020 Leigh Scott <leigh123linux@googlemail.com> - 0.159-5.20191127git1771b55
- Rebuild for ffmpeg-4.3 git
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.159-4.20191127git1771b55
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Dec 17 2019 Leigh Scott <leigh123linux@googlemail.com> - 0.159-3.20191127git1771b55
- Rebuild without bootstrap
* Tue Dec 17 2019 Leigh Scott <leigh123linux@googlemail.com> - 0.159-2.20191127git1771b55_bootstrap
- DO A BOOTSTRAP BUILD
* Mon Dec 16 2019 Sérgio Monteiro Basto <sergio@serjux.com> - 0.159-1.20191127git1771b55
- Update to 0.159-20191127-git1771b55 (stable branch)
* Tue Feb 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 0.157-12.20190717git34c06d1
- Rebuilt for MSVSphere 8.9
* Fri Oct 04 2019 Dominik Mierzejewski <rpm@greysector.net> - 0.157-12.20190717git34c06d1
- don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
@ -298,7 +255,7 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
* Wed Nov 07 2018 Stefan Becker <chemobejk@gmail.com> - 0.155-2.20180806git0a84d98
- reverse order of generic/generic10 install to fix -devel contents (rfbz #5071)
* Thu Oct 04 2018 Sérgio Basto <sergio@serjux.com> - 0.155-1.20180806git0a84d98
* Thu Oct 04 2018 Sérgio Basto <sergio@serjux.com> - 0.155-8.20180806git0a84d98
- Update x264 to 0.155
- Rebase x264-10b.patch
- Add a patch to fix linking with --system-libx264 on x86

@ -1 +0,0 @@
SHA512 (x264-0.163-20210613git5db6aa6.tar.bz2) = 6707b99df2d7232083b3fe4c24d67b42a53c5a0bc7ee739cdc48e6a6442c720d408514ce34d321bb1bbf82b0372e01a878116846665561e59d648ee8ca545733

@ -1,11 +0,0 @@
--- ./configure.orig 2019-12-17 02:19:30.000000000 +0000
+++ ./configure 2019-12-17 02:31:06.483935577 +0000
@@ -1390,7 +1390,7 @@ cat > x264_config.h << EOF
#define X264_CHROMA_FORMAT $config_chroma_format
EOF
-${SRCPATH}/version.sh >> x264_config.h
+cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
if [ "$shared" = "yes" ]; then
CFLAGSSO="$CFLAGSSO -DX264_API_EXPORTS"

@ -1,43 +0,0 @@
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
package=x264
branch=stable
commit=HEAD
pushd "$tmp"
git clone https://code.videolan.org/videolan/x264.git -b ${branch}
cd ${package}
tag=$(git rev-list HEAD -n 1 | cut -c 1-8)
git checkout ${commit}
git checkout -b rpmfusion
./version.sh > version.h
API="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"
date=$(git log -1 --format=%cd --date=short | tr -d \-)
git add version.h
git commit -m "generated version.h" version.h
git archive --prefix="${package}-0.$API-${date}git${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}git${tag}.tar.bz2
popd >/dev/null
echo \# globals for x264-0.$API-${date}git${tag}.tar.bz2
echo %global api $API
echo %global gitdate ${date}
echo %global gitversion ${tag}
echo
echo rpmdev-bumpspec -c \"Update to x264-0.$API-${date}git${tag} \(stable branch\)\" x264.spec
echo rfpkg scratch-build --srpm --arches x86_64
echo rfpkg new-sources x264-0.$API-${date}git${tag}.tar.bz2
echo rfpkg ci -c
Loading…
Cancel
Save