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

Changes of Revision 15

project.diff Deleted
x
 
1
@@ -1,86 +0,0 @@
2
---- _service.orig
3
-+++ _service
4
-@@ -3,7 +3,7 @@
5
-     <param name="url">https://code.videolan.org/videolan/x264.git</param>
6
-     <param name="scm">git</param>
7
-     <param name="revision">stable</param>
8
--    <param name="versionformat">0.161+git%cd.%h</param>
9
-+    <param name="versionformat">0.164+git%cd.%h</param>
10
-   </service>
11
-   <service name="recompress" mode="disabled">
12
-     <param name="file">*.tar</param>
13
---- baselibs.conf.orig
14
-+++ baselibs.conf
15
-@@ -1 +1 @@
16
--libx264-161
17
-+libx264-164
18
---- libx264.changes.orig
19
-+++ libx264.changes
20
-@@ -1,4 +1,13 @@
21
- -------------------------------------------------------------------
22
-+Sun Jun 12 07:23:57 UTC 2022 - Luigi Baldoni <aloisio@gmx.com>
23
-+
24
-+- Update to version 0.164+git20220602.baee400f
25
-+- Bump soversion to 164
26
-+- Drop pre_checkin.sh (no longer used)
27
-+- Drop x264-use-shared-library.patch, x264-gpac_no_static.patch
28
-+  and libx264.patch (no longer necessary)
29
-+
30
-+-------------------------------------------------------------------
31
- Tue Dec 29 16:16:16 UTC 2020 - olaf@aepfle.de
32
- 
33
- - Fix arm build with libx264.patch
34
---- libx264.spec.orig
35
-+++ libx264.spec
36
-@@ -18,7 +18,7 @@
37
- 
38
- 
39
- # remember to adjust baselibs.conf
40
--%define sover   161
41
-+%define sover   164
42
- %bcond_with     gpac
43
- 
44
- %define build_flavor @BUILD_FLAVOR@%{nil}
45
-@@ -29,7 +29,7 @@
46
- %define pkg %{tag}-%{build_flavor}
47
- %endif
48
- Name:           %{pkg}
49
--Version:        0.161+git20200912.d198931a
50
-+Version:        0.164+git20220602.baee400f
51
- Release:        0
52
- %if "%{build_flavor}" == ""
53
- Summary:        A free h264/avc encoder
54
-@@ -41,14 +41,11 @@ Group:          Productivity/Multimedia/
55
- URL:            http://www.videolan.org/developers/x264.html
56
- Source:         x264-%{version}.tar.xz
57
- Source1:        baselibs.conf
58
--Patch0:         x264-use-shared-library.patch
59
--# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch
60
--Patch2:         x264-gpac_no_static.patch
61
--Patch3:         libx264.patch
62
- BuildRequires:  nasm >= 2.13
63
- BuildRequires:  pkgconfig
64
- BuildRequires:  yasm >= 1.2.0
65
- %if "%{build_flavor}" == "x264"
66
-+BuildRequires:  pkgconfig(x264) == %{version}
67
- %if %{with gpac}
68
- BuildRequires:  pkgconfig(gpac)
69
- %else
70
-@@ -139,6 +136,7 @@ mplayer/mencoder with H264 encoding supp
71
-   --disable-opencl \
72
-   --enable-shared \
73
- %if "%{build_flavor}" == "x264"
74
-+  --system-libx264 \
75
- %if %{with gpac}
76
-   --disable-lsmash \
77
- %else
78
-@@ -163,6 +161,9 @@ install -Dm 755 x264 %{buildroot}/%{_bin
79
- rm -f %{buildroot}%{_libdir}/%{name}.so
80
- rm -f %{buildroot}%{_libdir}/%{name}.a
81
- ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so
82
-+
83
-+# fix pkg-config version
84
-+sed -i 's/Version:.*/Version: %{version}/' %{buildroot}%{_libdir}/pkgconfig/x264.pc
85
- %endif
86
- 
87
- %if "%{build_flavor}" == "x264"
88
_link Changed
13
 
1
@@ -1,10 +1,1 @@
2
-<link project="Essentials" cicount="add" baserev="db794274823fde50013a704f530020b7">
3
-  <patches>
4
-    <delete name="libx264.patch"/>
5
-    <delete name="pre_checkin.sh"/>
6
-    <delete name="x264-0.161+git20200912.d198931a.tar.xz"/>
7
-    <delete name="x264-gpac_no_static.patch"/>
8
-    <delete name="x264-use-shared-library.patch"/>
9
-    <apply name="project.diff"/>
10
-  </patches>
11
-</link>
12
+<link project="Essentials" cicount="add"/>
13
x264-0.164+git20220602.baee400f.tar.xz Deleted