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

Changes of Revision 15

project.diff Deleted
x
 
1
@@ -1,173 +0,0 @@
2
---- baselibs.conf.orig
3
-+++ baselibs.conf
4
-@@ -1 +1 @@
5
--libx265-192
6
-+libx265-199
7
---- x265.changes.orig
8
-+++ x265.changes
9
-@@ -1,4 +1,34 @@
10
- -------------------------------------------------------------------
11
-+Fri Mar 26 12:02:14 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
12
-+
13
-+- Update to version 3.5
14
-+  New features:
15
-+  * Real-time VBV for ABR (Average BitRate) encodes in –pass 2
16
-+    using --vbv-live-multi-pass. Improves VBV compliance with no
17
-+    significant impact on coding efficiency.
18
-+  Enhancements to existing features:
19
-+  * Improved hist-based scene cut algorithm: Reduces false
20
-+    positives by leveraging motion and scene transition info.
21
-+  * Support for RADL pictures at IDR scene cuts: Improves coding
22
-+    efficiency with no significant impact on performance.
23
-+  * Bidirectional scene cut aware Frame Quantizer Selection:
24
-+    Saves bits than forward masking with no noticeable perceptual
25
-+    quality difference.
26
-+  API changes:
27
-+  * Additions to x265_param structure to support the newly added
28
-+    features and encoder enhancements.
29
-+  * New x265_param options --min-vbv-fullness and
30
-+    --max-vbv-fullness to control min and max VBV fullness.
31
-+  Bug fixes:
32
-+  * Incorrect VBV lookahead in --analysis-load + --scale-factor.
33
-+  * Encoder hang when VBV is used with slices.
34
-+  * QP spikes in the row-level VBV rate-control when WPP enabled.
35
-+  * Encoder crash in --abr-ladder.
36
-+- Use new homepage and download URLs.
37
-+- Add subpackage for HDR10+ library
38
-+- Add update.sh
39
-+
40
-+-------------------------------------------------------------------
41
- Mon Jun  1 17:51:22 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
42
- 
43
- - Update to version 3.4
44
---- x265.spec.orig
45
-+++ x265.spec
46
-@@ -1,7 +1,7 @@
47
- #
48
- # spec file for package x265
49
- #
50
--# Copyright (c) 2020 Packman Team <packman@links2linux.de>
51
-+# Copyright (c) 2021 Packman Team <packman@links2linux.de>
52
- # Copyright (c) 2014 Torsten Gruner <t.gruner@katodev.de>
53
- #
54
- # All modifications and additions to the file contributed by third parties
55
-@@ -17,17 +17,18 @@
56
- #
57
- 
58
- 
59
--%define sover  192
60
-+%define sover   199
61
- %define libname lib%{name}
62
- %define libsoname %{libname}-%{sover}
63
-+%define uver    3_5
64
- Name:           x265
65
--Version:        3.4
66
-+Version:        3.5
67
- Release:        0
68
- Summary:        A free h265/HEVC encoder - encoder binary
69
- License:        GPL-2.0-or-later
70
- Group:          Productivity/Multimedia/Video/Editors and Convertors
71
--URL:            https://bitbucket.org/multicoreware/x265/wiki/Home
72
--Source0:        https://bitbucket.org/multicoreware/x265/downloads/%{name}_%{version}.tar.gz
73
-+URL:            https://bitbucket.org/multicoreware/x265_git
74
-+Source0:        https://bitbucket.org/multicoreware/x265_git/downloads/%{name}_%{version}.tar.gz
75
- Patch0:         arm.patch
76
- Patch1:         x265.pkgconfig.patch
77
- Patch2:         x265-fix_enable512.patch
78
-@@ -51,10 +52,18 @@ Group:          Productivity/Multimedia/
79
- x265 is a free library for encoding next-generation H265/HEVC video
80
- streams.
81
- 
82
-+%package -n libhdr10plus-%{uver}
83
-+Summary:        A free HDR10+ library
84
-+Group:          Productivity/Multimedia/Video/Editors and Convertors
85
-+
86
-+%description -n libhdr10plus-%{uver}
87
-+A free library supporting HDR10+.
88
-+
89
- %package -n %{libname}-devel
90
- Summary:        Libraries and include file for the %{libname} encoder
91
- Group:          Development/Libraries/C and C++
92
- Requires:       %{libsoname} = %{version}-%{release}
93
-+Requires:       libhdr10plus-%{uver} = %{version}-%{release}
94
- Provides:       %{name}-devel = %{version}
95
- Obsoletes:      %{name}-devel < %{version}
96
- 
97
-@@ -67,12 +76,15 @@ streams.
98
- %patch0 -p1
99
- %patch1 -p1
100
- %patch2 -p1
101
--sed -i -e "s/0.0/%{sover}.0/g" source/cmake/version.cmake
102
--
103
-+# set the version by hand
104
-+sed -i "/^include(Version)/d" source/CMakeLists.txt
105
-+# force version number in the soname
106
-+sed -i 's/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus/hdr10plus-shared PROPERTIES OUTPUT_NAME hdr10plus-%{version}/' \
107
-+       source/CMakeLists.txt
108
- 
109
- %build
110
- SOURCE_DIR="$PWD"/source
111
--COMMON_FLAGS="-DENABLE_TESTS=OFF -DENABLE_PIC=ON"
112
-+COMMON_FLAGS="-DENABLE_TESTS=OFF -DENABLE_PIC=ON -Wno-dev"
113
- HIGH_BIT_DEPTH_FLAGS="-DENABLE_CLI=OFF -DENABLE_SHARED=OFF -DEXPORT_C_API=OFF -DHIGH_BIT_DEPTH=ON"
114
- 
115
- %if 0%{?suse_version} >= 1500
116
-@@ -104,16 +116,24 @@ mv source/build-12bit/libx265.a source/b
117
- # Build general version of the library linking in the 10/12bit depth versions
118
- %define __builddir ./source/build
119
- %cmake -DENABLE_TESTS=OFF \
120
-+       -DENABLE_SHARED=ON \
121
-+       -DX265_LATEST_TAG="%{sover}.0" \
122
-+       -DX265_VERSION="%{version}" \
123
-+       -DENABLE_HDR10_PLUS=ON \
124
-        -DENABLE_PIC=ON \
125
-        -DENABLE_CLI=ON \
126
-        -DLINKED_10BIT=ON \
127
-        -DLINKED_12BIT=ON \
128
-        -DEXTRA_LINK_FLAGS="-L$SOURCE_DIR/build-10bit -L$SOURCE_DIR/build-12bit" \
129
--       -DEXTRA_LIB="x265_main10.a;x265_main12.a"
130
--
131
-+       -DEXTRA_LIB="x265_main10.a;x265_main12.a" \
132
-+       -Wno-dev
133
- %else
134
- cd source
135
--%cmake $COMMON_FLAGS
136
-+%cmake $COMMON_FLAGS \
137
-+       -DENABLE_SHARED=ON \
138
-+       -DX265_LATEST_TAG="%{sover}.0" \
139
-+       -DX265_VERSION="%{version}" \
140
-+       -DENABLE_HDR10_PLUS=ON
141
- %endif
142
- make %{?_smp_mflags}
143
- cd ../../
144
-@@ -123,15 +143,20 @@ cd ../../
145
- cd source
146
- %endif
147
- %cmake_install
148
--rm -f %{buildroot}%{_libdir}/%{libname}.a
149
--echo "%{libname}-%{sover}" > %{_sourcedir}/baselibs.conf
150
-+find %{buildroot} -type f -name "*.a" -delete -print0
151
- 
152
- %post -n %{libsoname} -p /sbin/ldconfig
153
- %postun -n %{libsoname} -p /sbin/ldconfig
154
- 
155
-+%post -n libhdr10plus-%{uver} -p /sbin/ldconfig
156
-+%postun -n libhdr10plus-%{uver} -p /sbin/ldconfig
157
-+
158
- %files -n %{libsoname}
159
- %{_libdir}/%{libname}.so.%{sover}*
160
- 
161
-+%files -n libhdr10plus-%{uver}
162
-+%{_libdir}/libhdr10plus-%{version}.so
163
-+
164
- %files
165
- %{_bindir}/%{name}
166
- 
167
-@@ -140,6 +165,7 @@ echo "%{libname}-%{sover}" > %{_sourcedi
168
- %doc readme.rst
169
- %{_includedir}/%{name}.h
170
- %{_includedir}/%{name}_config.h
171
-+%{_includedir}/hdr10plus.h
172
- %{_libdir}/pkgconfig/%{name}.pc
173
- %{_libdir}/%{libname}.so
174
- 
175
_link Changed
9
 
1
@@ -1,6 +1,1 @@
2
-<link project="Essentials" cicount="add" baserev="ed237a9ed5520132996d0a5905c4e744">
3
-  <patches>
4
-    <delete name="x265_3.4.tar.gz" />
5
-    <apply name="project.diff" />
6
-  </patches>
7
-</link>
8
+<link project="Essentials" cicount="add" />
9
update.sh Deleted
12
 
1
@@ -1,10 +0,0 @@
2
-#!/bin/sh
3
-
4
-rm -f x265_*.tar.gz
5
-osc service disabledrun download_files
6
-version=$(grep ^Version x265.spec|awk '{print $2}')
7
-echo "The new version is:" $version
8
-api=$(tar xzfO x265_${version}.tar.gz x265_${version}/source/CMakeLists.txt|grep "set(X265_BUILD"|sed 's/^.* \([1-9][0-9]*\).*$/\1/')
9
-echo "The new api version is:" $api
10
-echo "libx265-${api}" > baselibs.conf
11
-sed -i "/^%define sover/c%define sover   ${api}" x265.spec
12
x265_3.5.tar.gz Deleted