rpms
/
x264
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.157 (stable branch)

Browse Source 
Rebase patches
el8
Sérgio M. Basto 6 years ago
parent 66e12e4605
commit 6c6c507838
6 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -8,3 +8,4 @@ x264-0.148-20160118-5c65704.tar.bz2
/x264-0.148-20170521-aaa9aa8.tar.bz2 /x264-0.148-20170521-aaa9aa8.tar.bz2
/x264-0.152-20171224-e9a5903.tar.bz2 /x264-0.152-20171224-e9a5903.tar.bz2
/x264-0.155-20180806-0a84d98.tar.bz2 /x264-0.155-20180806-0a84d98.tar.bz2
/x264-0.157-20190303-72db437.tar.bz2

2
sources
Unescape View File

@ -1 +1 @@
38666b9a1b712f3d0c1073105af2e6a5 x264-0.155-20180806-0a84d98.tar.bz2 fc5fb1afb4a87a0e65ad966e1d8ea28d x264-0.157-20190303-72db437.tar.bz2

14
x264-10b.patch
Unescape View File

@ -1,7 +1,7 @@
diff -up generic10/configure.10b generic10/configure diff -up generic10/configure.10b generic10/configure
--- generic10/configure.10b 2016-08-26 19:48:41.447839506 +0200 --- generic10/configure.10b 2016-08-26 19:48:41.447839506 +0200
+++ generic10/configure 2016-08-26 19:49:26.902033893 +0200 +++ generic10/configure 2016-08-26 19:49:26.902033893 +0200
@@ -1466,6 +1466,12 @@ PROF_USE_LD=$PROF_USE_LD @@ -1473,6 +1473,12 @@ PROF_USE_LD=$PROF_USE_LD
HAVE_OPENCL=$opencl HAVE_OPENCL=$opencl
EOF EOF
@ -14,7 +14,7 @@ diff -up generic10/configure.10b generic10/configure
if [ $compiler_style = MS ]; then if [ $compiler_style = MS ]; then
echo 'CC_O=-Fo$@' >> config.mak echo 'CC_O=-Fo$@' >> config.mak
else else
@@ -1505,7 +1511,7 @@ if [ "$shared" = "yes" ]; then @@ -1512,7 +1518,7 @@ if [ "$shared" = "yes" ]; then
echo "SOFLAGS=-shared -Wl,-h,\$(SONAME) $SOFLAGS" >> config.mak echo "SOFLAGS=-shared -Wl,-h,\$(SONAME) $SOFLAGS" >> config.mak
else else
echo "SOSUFFIX=so" >> config.mak echo "SOSUFFIX=so" >> config.mak
@ -24,9 +24,9 @@ diff -up generic10/configure.10b generic10/configure
fi fi
echo 'default: lib-shared' >> config.mak echo 'default: lib-shared' >> config.mak
diff -up generic10/Makefile.10b generic10/Makefile diff -up generic10/Makefile.10b generic10/Makefile
--- generic10/Makefile.10b 2016-06-14 14:04:37.000000000 +0200 --- generic10/Makefile.10b 2016-06-14 14:04:37.000000000 +0200
+++ generic10/Makefile 2016-08-26 19:48:41.449839514 +0200 +++ generic10/Makefile 2016-08-26 19:48:41.449839514 +0200
@@ -405,7 +405,7 @@ ifneq ($(IMPLIBNAME),) @@ -398,7 +398,7 @@ ifneq ($(IMPLIBNAME),)
$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir) $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir) $(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
else ifneq ($(SONAME),) else ifneq ($(SONAME),)

6
x264-gpac.patch
Unescape View File

@ -1,6 +1,6 @@
--- x264-0.140-20140122-de0bc36/configure.orig 2014-01-22 23:26:55.922650888 +0000 --- ./configure.orig 2019-03-12 00:41:42.000000000 +0000
+++ x264-0.140-20140122-de0bc36/configure 2014-02-24 02:35:19.263127505 +0000 +++ ./configure 2019-03-12 01:10:12.603640526 +0000
@@ -941,7 +941,9 @@ @@ -1207,7 +1207,9 @@ fi
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no" gpac="no"
GPAC_LIBS="-lgpac_static" GPAC_LIBS="-lgpac_static"

34
x264-sandbox.git-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch
Unescape View File

@ -1,34 +0,0 @@
From b63c73dc5c37e5405bf032c9113c1daced3e45a4 Mon Sep 17 00:00:00 2001
From: Henrik Gramner <henrik@gramner.com>
Date: Tue, 7 Aug 2018 22:42:22 +0200
Subject: [PATCH] cli: Fix linking with --system-libx264 on x86
---
common/x86/cpu-a.asm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm
index d94f7d54..a41d67f8 100644
--- a/common/x86/cpu-a.asm
+++ b/common/x86/cpu-a.asm
@@ -83,7 +83,7 @@ cglobal cpu_sfence
;-----------------------------------------------------------------------------
; intptr_t stack_align( void (*func)(void*), ... ); (up to 5 args)
;-----------------------------------------------------------------------------
-cglobal stack_align
+cvisible stack_align
mov rax, r0mp
mov r0, r1mp
mov r1, r2mp
@@ -131,7 +131,7 @@ cglobal cpu_cpuid_test
popfd
ret
-cglobal stack_align
+cvisible stack_align
push ebp
mov ebp, esp
sub esp, 20
--
2.11.0

16
x264.spec
Unescape View File

@ -1,7 +1,7 @@
# globals for x264-0.155-20180806-0a84d98.tar.bz2 # globals for x264-0.157-20190303-72db437.tar.bz2
%global api 155 %global api 157
%global gitdate 20180806 %global gitdate 20190303
%global gitversion 0a84d98 %global gitversion 72db437
%global snapshot %{gitdate}-%{gitversion} %global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion} %global gver .%{gitdate}git%{gitversion}
@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder Summary: H264/AVC video streams encoder
Name: x264 Name: x264
Version: 0.%{api} Version: 0.%{api}
Release: 3%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://www.videolan.org/developers/x264.html URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@ -42,7 +42,6 @@ Patch0: x264-nover.patch
# add 10b suffix to high bit depth build # add 10b suffix to high bit depth build
Patch1: x264-10b.patch Patch1: x264-10b.patch
Patch10: x264-gpac.patch Patch10: x264-gpac.patch
Patch20: x264-sandbox.git-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch
BuildRequires: gcc BuildRequires: gcc
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel} %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
@ -99,7 +98,6 @@ pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover %patch0 -p1 -b .nover
%patch1 -p1 -b .10b %patch1 -p1 -b .10b
%patch10 -p1 -b .gpac %patch10 -p1 -b .gpac
%patch20 -p1 -b .stack_align
popd popd
variants="generic generic10" variants="generic generic10"
@ -205,6 +203,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif %endif
%changelog %changelog
* Tue Mar 12 2019 Sérgio Basto <sergio@serjux.com> - 0.157-1.20190303git72db437
- Update to 0.157 (stable branch)
- Rebase patches
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.155-3.20180806git0a84d98 * Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.155-3.20180806git0a84d98
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Write Preview
Loading…
Cancel
Save