Request 5057 (accepted)

This request supersedes: request 5055 (Show diff)

Overview

Request 5057 (accepted)

- Update to git version 0.159+git20191127.1771b556
- Use _service to retrieve the git sources
- Bump soname to 159
- Remove patch which is already included upstream
* 0001-cli-Fix-linking-with-system-libx264-on-x86.patch
- Rebase x264-use-shared-library.patch
- Removed a rpmlint error by rephrasing the summary of the libx264-x264.spec file

Created by antlarr over 4 years ago
In state accepted
Supersedes 5055

Submit libx264

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

libx264-x264.changes Changed

libx264.changes Changed

libx264-x264.spec Changed

@@ -17,22 +17,20 @@
 
 
 %define _lto_cflags %{nil}
-%define soname  155
-%define svn     20190201
+%define soname  159
 %bcond_without  gpac
 ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####
 %bcond_without  x264_binary
 Name:           libx264-x264
-Version:        0.%{soname}svn%{svn}
+Version:        0.159+git20191127.1771b556
 Release:        0
-Summary:        x264 cli tool
+Summary:        Command line tool for libx264
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.videolan.org/developers/x264.html
-Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
+Source:         x264-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch0:         x264-use-shared-library.patch
-Patch1:         0001-cli-Fix-linking-with-system-libx264-on-x86.patch
 BuildRequires:  nasm >= 2.13
 BuildRequires:  pkgconfig
 BuildRequires:  yasm >= 1.2.0
@@ -118,7 +116,7 @@
 mplayer/mencoder with H264 encoding support.
 
 %prep
-%autosetup -p1 -n x264-snapshot-%{svn}-2245-stable
+%autosetup -p1 -n x264-%{version}
 
 %build
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

libx264.spec Changed

@@ -17,21 +17,19 @@
 
 
 %define _lto_cflags %{nil}
-%define soname  155
-%define svn     20190201
+%define soname  159
 %bcond_without  gpac
 %bcond_with     x264_binary
 Name:           libx264
-Version:        0.%{soname}svn%{svn}
+Version:        0.159+git20191127.1771b556
 Release:        0
 Summary:        A free h264/avc encoder - encoder binary
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.videolan.org/developers/x264.html
-Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
+Source:         x264-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch0:         x264-use-shared-library.patch
-Patch1:         0001-cli-Fix-linking-with-system-libx264-on-x86.patch
 BuildRequires:  nasm >= 2.13
 BuildRequires:  pkgconfig
 BuildRequires:  yasm >= 1.2.0
@@ -117,7 +115,7 @@
 mplayer/mencoder with H264 encoding support.
 
 %prep
-%autosetup -p1 -n x264-snapshot-%{svn}-2245-stable
+%autosetup -p1 -n x264-%{version}
 
 %build
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

0001-cli-Fix-linking-with-system-libx264-on-x86.patch Deleted

@@ -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 1/1] 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
-

x264-use-shared-library.patch Changed

_service Added

pre_checkin.sh Changed

x264-0.159+git20191127.1771b556.tar.xz Added

x264-snapshot-20190201-2245-stable.tar.bz2 Deleted

Build Results
RPM Lint

Refresh

Comments for request 5057 0

Request History

antlarr created request over 4 years ago

olh accepted request over 4 years ago