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
- 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 package
libx264-x264.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>4
+5
+- Update to git version 0.159+git20191127.1771b5566
+- Use _service to retrieve the git sources7
+- Bump soname to 1598
+- Remove patch which is already included upstream9
+ * 0001-cli-Fix-linking-with-system-libx264-on-x86.patch10
+- Rebase x264-use-shared-library.patch11
+- Removed a rpmlint error by rephrasing the summary of the libx264-x264.spec file12
+13
+-------------------------------------------------------------------14
Sat Feb 2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com15
16
- Update to 20190201 snapshot17
libx264.changes
Changed
17
1
2
-------------------------------------------------------------------3
+Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>4
+5
+- Update to git version 0.159+git20191127.1771b5566
+- Use _service to retrieve the git sources7
+- Bump soname to 1598
+- Remove patch which is already included upstream9
+ * 0001-cli-Fix-linking-with-system-libx264-on-x86.patch10
+- Rebase x264-use-shared-library.patch11
+- Removed a rpmlint error by rephrasing the summary of the libx264-x264 package12
+13
+-------------------------------------------------------------------14
Sat Feb 2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com15
16
- Update to 20190201 snapshot17
libx264-x264.spec
Changed
37
1
2
3
4
%define _lto_cflags %{nil}5
-%define soname 1556
-%define svn 201902017
+%define soname 1598
%bcond_without gpac9
##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####10
%bcond_without x264_binary11
Name: libx264-x26412
-Version: 0.%{soname}svn%{svn}13
+Version: 0.159+git20191127.1771b55614
Release: 015
-Summary: x264 cli tool16
+Summary: Command line tool for libx26417
License: GPL-2.0+18
Group: Productivity/Multimedia/Video/Editors and Convertors19
Url: http://www.videolan.org/developers/x264.html20
-Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz221
+Source: x264-%{version}.tar.xz22
Source1: baselibs.conf23
Patch0: x264-use-shared-library.patch24
-Patch1: 0001-cli-Fix-linking-with-system-libx264-on-x86.patch25
BuildRequires: nasm >= 2.1326
BuildRequires: pkgconfig27
BuildRequires: yasm >= 1.2.028
29
mplayer/mencoder with H264 encoding support.30
31
%prep32
-%autosetup -p1 -n x264-snapshot-%{svn}-2245-stable33
+%autosetup -p1 -n x264-%{version}34
35
%build36
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')37
libx264.spec
Changed
35
1
2
3
4
%define _lto_cflags %{nil}5
-%define soname 1556
-%define svn 201902017
+%define soname 1598
%bcond_without gpac9
%bcond_with x264_binary10
Name: libx26411
-Version: 0.%{soname}svn%{svn}12
+Version: 0.159+git20191127.1771b55613
Release: 014
Summary: A free h264/avc encoder - encoder binary15
License: GPL-2.0+16
Group: Productivity/Multimedia/Video/Editors and Convertors17
Url: http://www.videolan.org/developers/x264.html18
-Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz219
+Source: x264-%{version}.tar.xz20
Source1: baselibs.conf21
Patch0: x264-use-shared-library.patch22
-Patch1: 0001-cli-Fix-linking-with-system-libx264-on-x86.patch23
BuildRequires: nasm >= 2.1324
BuildRequires: pkgconfig25
BuildRequires: yasm >= 1.2.026
27
mplayer/mencoder with H264 encoding support.28
29
%prep30
-%autosetup -p1 -n x264-snapshot-%{svn}-2245-stable31
+%autosetup -p1 -n x264-%{version}32
33
%build34
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')35
0001-cli-Fix-linking-with-system-libx264-on-x86.patch
Deleted
36
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
x264-use-shared-library.patch
Changed
12
1
2
$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)3
+ ln -s $(SONAME) libx264.so4
5
- ifneq ($(EXE),)6
- .PHONY: x264 checkasm8 checkasm10 example7
+ $(IMPLIBNAME): $(SONAME)8
+ 9
@@ -198,8 +199,8 @@ checkasm: checkasm$(EXE)10
example: example$(EXE)11
endif12
_service
Added
15
1
2
+<services>3
+ <service name="tar_scm" mode="disabled">4
+ <param name="url">https://code.videolan.org/videolan/x264.git</param>5
+ <param name="scm">git</param>6
+ <param name="revision">stable</param>7
+ <param name="versionformat">0.159+git%cd.%h</param>8
+ </service>9
+ <service name="recompress" mode="disabled">10
+ <param name="file">*.tar</param>11
+ <param name="compression">xz</param>12
+ </service>13
+ <service name="set_version" mode="disabled" />14
+</services>15
pre_checkin.sh
Changed
10
1
2
EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####\n"3
sed "s/^%bcond_with x264_binary$/${EDIT_WARNING}%bcond_without x264_binary/;4
s/^\(Name:.*\)$/\1-x264/;5
- 0,/^Summary:.*/{s/^Summary:.*/Summary: x264 cli tool/};6
+ 0,/^Summary:.*/{s/^Summary:.*/Summary: Command line tool for libx264/};7
" < libx264.spec > libx264-x264.spec8
cp libx264.changes libx264-x264.changes9
10
x264-0.159+git20191127.1771b556.tar.xz
Added
x264-snapshot-20190201-2245-stable.tar.bz2
Deleted
Refresh
Refresh
Login required, please
login
or
signup
in order to comment
Request History
antlarr created request about 5 years ago
- 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
- 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 package
olh accepted request about 5 years ago