Problem getting expanded diff: bad link: could not apply patch 'project.diff'

Changes of Revision 7

project.diff Deleted
x
 
1
@@ -1,134 +0,0 @@
2
---- libx264-x264.changes.orig
3
-+++ libx264-x264.changes
4
-@@ -1,4 +1,15 @@
5
- -------------------------------------------------------------------
6
-+Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>
7
-+
8
-+- Update to git version 0.159+git20191127.1771b556
9
-+- Use _service to retrieve the git sources
10
-+- Bump soname to 159
11
-+- Remove patch which is already included upstream
12
-+  * 0001-cli-Fix-linking-with-system-libx264-on-x86.patch
13
-+- Rebase x264-use-shared-library.patch
14
-+- Removed a rpmlint error by rephrasing the summary of the libx264-x264.spec file
15
-+
16
-+-------------------------------------------------------------------
17
- Sat Feb  2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com
18
- 
19
- - Update to 20190201 snapshot
20
---- libx264-x264.spec.orig
21
-+++ libx264-x264.spec
22
-@@ -17,22 +17,20 @@
23
- 
24
- 
25
- %define _lto_cflags %{nil}
26
--%define soname  155
27
--%define svn     20190201
28
-+%define soname  159
29
- %bcond_without  gpac
30
- ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####
31
- %bcond_without  x264_binary
32
- Name:           libx264-x264
33
--Version:        0.%{soname}svn%{svn}
34
-+Version:        0.159+git20191127.1771b556
35
- Release:        0
36
--Summary:        x264 cli tool
37
-+Summary:        Command line tool for libx264
38
- License:        GPL-2.0+
39
- Group:          Productivity/Multimedia/Video/Editors and Convertors
40
- Url:            http://www.videolan.org/developers/x264.html
41
--Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
42
-+Source:         x264-%{version}.tar.xz
43
- Source1:        baselibs.conf
44
- Patch0:         x264-use-shared-library.patch
45
--Patch1:         0001-cli-Fix-linking-with-system-libx264-on-x86.patch
46
- BuildRequires:  nasm >= 2.13
47
- BuildRequires:  pkgconfig
48
- BuildRequires:  yasm >= 1.2.0
49
-@@ -118,7 +116,7 @@ development with libx264. This library i
50
- mplayer/mencoder with H264 encoding support.
51
- 
52
- %prep
53
--%autosetup -p1 -n x264-snapshot-%{svn}-2245-stable
54
-+%autosetup -p1 -n x264-%{version}
55
- 
56
- %build
57
- FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
58
---- libx264.changes.orig
59
-+++ libx264.changes
60
-@@ -1,4 +1,15 @@
61
- -------------------------------------------------------------------
62
-+Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>
63
-+
64
-+- Update to git version 0.159+git20191127.1771b556
65
-+- Use _service to retrieve the git sources
66
-+- Bump soname to 159
67
-+- Remove patch which is already included upstream
68
-+  * 0001-cli-Fix-linking-with-system-libx264-on-x86.patch
69
-+- Rebase x264-use-shared-library.patch
70
-+- Removed a rpmlint error by rephrasing the summary of the libx264-x264 package
71
-+
72
-+-------------------------------------------------------------------
73
- Sat Feb  2 19:22:57 UTC 2019 - antonio.larrosa@gmail.com
74
- 
75
- - Update to 20190201 snapshot
76
---- libx264.spec.orig
77
-+++ libx264.spec
78
-@@ -17,21 +17,19 @@
79
- 
80
- 
81
- %define _lto_cflags %{nil}
82
--%define soname  155
83
--%define svn     20190201
84
-+%define soname  159
85
- %bcond_without  gpac
86
- %bcond_with     x264_binary
87
- Name:           libx264
88
--Version:        0.%{soname}svn%{svn}
89
-+Version:        0.159+git20191127.1771b556
90
- Release:        0
91
- Summary:        A free h264/avc encoder - encoder binary
92
- License:        GPL-2.0+
93
- Group:          Productivity/Multimedia/Video/Editors and Convertors
94
- Url:            http://www.videolan.org/developers/x264.html
95
--Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
96
-+Source:         x264-%{version}.tar.xz
97
- Source1:        baselibs.conf
98
- Patch0:         x264-use-shared-library.patch
99
--Patch1:         0001-cli-Fix-linking-with-system-libx264-on-x86.patch
100
- BuildRequires:  nasm >= 2.13
101
- BuildRequires:  pkgconfig
102
- BuildRequires:  yasm >= 1.2.0
103
-@@ -117,7 +115,7 @@ development with libx264. This library i
104
- mplayer/mencoder with H264 encoding support.
105
- 
106
- %prep
107
--%autosetup -p1 -n x264-snapshot-%{svn}-2245-stable
108
-+%autosetup -p1 -n x264-%{version}
109
- 
110
- %build
111
- FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
112
---- pre_checkin.sh.orig
113
-+++ pre_checkin.sh
114
-@@ -2,7 +2,7 @@
115
- EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####\n"
116
- sed "s/^%bcond_with     x264_binary$/${EDIT_WARNING}%bcond_without  x264_binary/;
117
-      s/^\(Name:.*\)$/\1-x264/;
118
--     0,/^Summary:.*/{s/^Summary:.*/Summary:        x264 cli tool/};
119
-+     0,/^Summary:.*/{s/^Summary:.*/Summary:        Command line tool for libx264/};
120
-     " < libx264.spec > libx264-x264.spec
121
- cp libx264.changes libx264-x264.changes
122
- 
123
---- x264-use-shared-library.patch.orig
124
-+++ x264-use-shared-library.patch
125
-@@ -8,8 +8,8 @@ Index: x264-snapshot-20160430-2245-stabl
126
-   $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
127
- + ln -s $(SONAME) libx264.so
128
-  
129
-- ifneq ($(EXE),)
130
-- .PHONY: x264 checkasm8 checkasm10 example
131
-+ $(IMPLIBNAME): $(SONAME)
132
-+ 
133
- @@ -198,8 +199,8 @@ checkasm: checkasm$(EXE)
134
-  example: example$(EXE)
135
-  endif
136
_link Changed
10
 
1
@@ -1,7 +1,1 @@
2
-<link project="Essentials" cicount="add" baserev="e37da5ebe5557fdcf36f66391377b7db">
3
-  <patches>
4
-    <delete name="0001-cli-Fix-linking-with-system-libx264-on-x86.patch" />
5
-    <delete name="x264-snapshot-20190201-2245-stable.tar.bz2" />
6
-    <apply name="project.diff" />
7
-  </patches>
8
-</link>
9
+<link project="Essentials" cicount="add" />
10
_service Deleted
15
 
1
@@ -1,13 +0,0 @@
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
x264-0.159+git20191127.1771b556.tar.xz Deleted