Changes of Revision 5
0001-cli-Fix-linking-with-system-libx264-on-x86.patch
Deleted
x
1
2
-From b63c73dc5c37e5405bf032c9113c1daced3e45a4 Mon Sep 17 00:00:00 20013
-From: Henrik Gramner <henrik@gramner.com>4
-Date: Tue, 7 Aug 2018 22:42:22 +02005
-Subject: [PATCH 1/1] cli: Fix linking with --system-libx264 on x866
-7
----8
- common/x86/cpu-a.asm | 4 ++--9
- 1 file changed, 2 insertions(+), 2 deletions(-)10
-11
-diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm12
-index d94f7d54..a41d67f8 10064413
---- a/common/x86/cpu-a.asm14
-+++ b/common/x86/cpu-a.asm15
-@@ -83,7 +83,7 @@ cglobal cpu_sfence16
- ;-----------------------------------------------------------------------------17
- ; intptr_t stack_align( void (*func)(void*), ... ); (up to 5 args)18
- ;-----------------------------------------------------------------------------19
--cglobal stack_align20
-+cvisible stack_align21
- mov rax, r0mp22
- mov r0, r1mp23
- mov r1, r2mp24
-@@ -131,7 +131,7 @@ cglobal cpu_cpuid_test25
- popfd26
- ret27
- 28
--cglobal stack_align29
-+cvisible stack_align30
- push ebp31
- mov ebp, esp32
- sub esp, 2033
--- 34
-2.11.035
-36
project.diff
Deleted
77
1
2
---- baselibs.conf.orig3
-+++ baselibs.conf4
-@@ -1 +1 @@5
--libx264-1576
-+libx264-1557
---- libx264-x264.changes.orig8
-+++ libx264-x264.changes9
-@@ -1,11 +1,4 @@10
- -------------------------------------------------------------------11
--Wed Mar 25 17:05:31 UTC 2020 - enzokiel@kabelmail.de12
--13
--- Update to 20191217 snapshot14
--- Removed 0001-cli-Fix-linking-with-system-libx264-on-x86.patch,15
-- fixed upstream.16
--17
---------------------------------------------------------------------18
- Sat Feb 2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com19
- 20
- - Update to 20190201 snapshot21
---- libx264-x264.spec.orig22
-+++ libx264-x264.spec23
-@@ -17,8 +17,8 @@24
- 25
- 26
- %define _lto_cflags %{nil}27
--%define soname 15728
--%define svn 2019121729
-+%define soname 15530
-+%define svn 2019020131
- %bcond_without gpac32
- ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####33
- %bcond_without x264_binary34
-@@ -32,6 +32,7 @@ Url: http://www.videolan.org/35
- Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz236
- Source1: baselibs.conf37
- Patch0: x264-use-shared-library.patch38
-+Patch1: 0001-cli-Fix-linking-with-system-libx264-on-x86.patch39
- BuildRequires: nasm >= 2.1340
- BuildRequires: pkgconfig41
- BuildRequires: yasm >= 1.2.042
---- libx264.changes.orig43
-+++ libx264.changes44
-@@ -1,11 +1,4 @@45
- -------------------------------------------------------------------46
--Wed Mar 25 17:05:31 UTC 2020 - enzokiel@kabelmail.de47
--48
--- Update to 20191217 snapshot49
--- Removed 0001-cli-Fix-linking-with-system-libx264-on-x86.patch,50
-- fixed upstream.51
--52
---------------------------------------------------------------------53
- Sat Feb 2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com54
- 55
- - Update to 20190201 snapshot56
---- libx264.spec.orig57
-+++ libx264.spec58
-@@ -17,8 +17,8 @@59
- 60
- 61
- %define _lto_cflags %{nil}62
--%define soname 15763
--%define svn 2019121764
-+%define soname 15565
-+%define svn 2019020166
- %bcond_without gpac67
- %bcond_with x264_binary68
- Name: libx26469
-@@ -31,6 +31,7 @@ Url: http://www.videolan.org/70
- Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz271
- Source1: baselibs.conf72
- Patch0: x264-use-shared-library.patch73
-+Patch1: 0001-cli-Fix-linking-with-system-libx264-on-x86.patch74
- BuildRequires: nasm >= 2.1375
- BuildRequires: pkgconfig76
- BuildRequires: yasm >= 1.2.077
_link
Changed
9
1
2
-<link project="Essentials" cicount="add" baserev="26264686312b50d1792cebfc53bfb4f5">3
- <patches>4
- <delete name="x264-snapshot-20191217-2245-stable.tar.bz2" />5
- <apply name="project.diff" />6
- </patches>7
-</link>8
+<link project="Essentials" cicount="add" />9
x264-snapshot-20190201-2245-stable.tar.bz2
Deleted