Overview

Request 5048 (accepted)

- Update to 20191217 snapshot
- Removed 0001-cli-Fix-linking-with-system-libx264-on-x86.patch, fixed upstream.

Submit package home:enzokiel:branches:Staging / libx264 to package Staging / libx264

libx264-x264.changes Changed
x
 
1
@@ -1,4 +1,11 @@
2
 -------------------------------------------------------------------
3
+Wed Mar 25 17:05:31 UTC 2020 - enzokiel@kabelmail.de
4
+
5
+- Update to 20191217 snapshot
6
+- Removed 0001-cli-Fix-linking-with-system-libx264-on-x86.patch,
7
+  fixed upstream.
8
+
9
+-------------------------------------------------------------------
10
 Sat Feb  2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com
11
 
12
 - Update to 20190201 snapshot
13
libx264.changes Changed
13
 
1
@@ -1,4 +1,11 @@
2
 -------------------------------------------------------------------
3
+Wed Mar 25 17:05:31 UTC 2020 - enzokiel@kabelmail.de
4
+
5
+- Update to 20191217 snapshot
6
+- Removed 0001-cli-Fix-linking-with-system-libx264-on-x86.patch,
7
+  fixed upstream.
8
+
9
+-------------------------------------------------------------------
10
 Sat Feb  2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com
11
 
12
 - Update to 20190201 snapshot
13
libx264-x264.spec Changed
20
 
1
@@ -17,8 +17,8 @@
2
 
3
 
4
 %define _lto_cflags %{nil}
5
-%define soname  155
6
-%define svn     20190201
7
+%define soname  157
8
+%define svn     20191217
9
 %bcond_without  gpac
10
 ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####
11
 %bcond_without  x264_binary
12
@@ -32,7 +32,6 @@
13
 Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
14
 Source1:        baselibs.conf
15
 Patch0:         x264-use-shared-library.patch
16
-Patch1:         0001-cli-Fix-linking-with-system-libx264-on-x86.patch
17
 BuildRequires:  nasm >= 2.13
18
 BuildRequires:  pkgconfig
19
 BuildRequires:  yasm >= 1.2.0
20
libx264.spec Changed
20
 
1
@@ -17,8 +17,8 @@
2
 
3
 
4
 %define _lto_cflags %{nil}
5
-%define soname  155
6
-%define svn     20190201
7
+%define soname  157
8
+%define svn     20191217
9
 %bcond_without  gpac
10
 %bcond_with     x264_binary
11
 Name:           libx264
12
@@ -31,7 +31,6 @@
13
 Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
14
 Source1:        baselibs.conf
15
 Patch0:         x264-use-shared-library.patch
16
-Patch1:         0001-cli-Fix-linking-with-system-libx264-on-x86.patch
17
 BuildRequires:  nasm >= 2.13
18
 BuildRequires:  pkgconfig
19
 BuildRequires:  yasm >= 1.2.0
20
0001-cli-Fix-linking-with-system-libx264-on-x86.patch Deleted
36
 
1
@@ -1,34 +0,0 @@
2
-From b63c73dc5c37e5405bf032c9113c1daced3e45a4 Mon Sep 17 00:00:00 2001
3
-From: Henrik Gramner <henrik@gramner.com>
4
-Date: Tue, 7 Aug 2018 22:42:22 +0200
5
-Subject: [PATCH 1/1] cli: Fix linking with --system-libx264 on x86
6
-
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.asm
12
-index d94f7d54..a41d67f8 100644
13
---- a/common/x86/cpu-a.asm
14
-+++ b/common/x86/cpu-a.asm
15
-@@ -83,7 +83,7 @@ cglobal cpu_sfence
16
- ;-----------------------------------------------------------------------------
17
- ; intptr_t stack_align( void (*func)(void*), ... ); (up to 5 args)
18
- ;-----------------------------------------------------------------------------
19
--cglobal stack_align
20
-+cvisible stack_align
21
-     mov      rax, r0mp
22
-     mov       r0, r1mp
23
-     mov       r1, r2mp
24
-@@ -131,7 +131,7 @@ cglobal cpu_cpuid_test
25
-     popfd
26
-     ret
27
- 
28
--cglobal stack_align
29
-+cvisible stack_align
30
-     push      ebp
31
-     mov       ebp, esp
32
-     sub       esp, 20
33
--- 
34
-2.11.0
35
-
36
baselibs.conf Changed
4
 
1
@@ -1,1 +1,1 @@
2
-libx264-155
3
+libx264-157
4
x264-snapshot-20190201-2245-stable.tar.bz2 Deleted
x264-snapshot-20191217-2245-stable.tar.bz2 Added
Refresh
Refresh
Request History
enzokiel's avatar

enzokiel created request about 5 years ago

- Update to 20191217 snapshot
- Removed 0001-cli-Fix-linking-with-system-libx264-on-x86.patch, fixed upstream.


enzokiel's avatar

enzokiel accepted request about 5 years ago