We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 26
project.diff
Deleted
x
1
2
---- 0001-Fix-arm-flags.patch.orig
3
-+++ 0001-Fix-arm-flags.patch
4
-@@ -3,14 +3,16 @@ Date: Sun, 21 Jun 2020 17:54:56 +0200
5
- Subject: Fix arm* flags
6
-
7
- ---
8
-- source/CMakeLists.txt | 7 ++-----
9
-- 1 file changed, 2 insertions(+), 5 deletions(-)
10
-+ source/CMakeLists.txt | 3 ---
11
-+ source/cmake/FindNEON_DOTPROD.cmake | 2 +-
12
-+ source/cmake/FindNEON_I8MM.cmake | 2 +-
13
-+ source/cmake/FindSVE.cmake | 2 +-
14
-+ source/cmake/FindSVE2.cmake | 4 ++--
15
-+ 5 files changed, 5 insertions(+), 8 deletions(-)
16
-
17
--diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
18
--index ab5ddfe..eb9b19b 100755
19
- --- a/source/CMakeLists.txt
20
- +++ b/source/CMakeLists.txt
21
--@@ -253,10 +253,7 @@ if(GCC)
22
-+@@ -274,10 +274,7 @@
23
- elseif(ARM)
24
- find_package(Neon)
25
- if(CPU_HAS_NEON)
26
-@@ -20,20 +22,42 @@ index ab5ddfe..eb9b19b 100755
27
- - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
28
- endif()
29
- endif()
30
-- if(ARM64 OR CROSS_COMPILE_ARM64)
31
--@@ -265,13 +262,13 @@ if(GCC)
32
-- find_package(SVE2)
33
-- if(CPU_HAS_SVE2 OR CROSS_COMPILE_SVE2)
34
-- message(STATUS "Found SVE2")
35
--- set(ARM_ARGS -O3 -march=armv8-a+sve2 -fPIC -flax-vector-conversions)
36
--+ set(ARM_ARGS -fPIC -flax-vector-conversions)
37
-- add_definitions(-DHAVE_SVE2)
38
-- add_definitions(-DHAVE_SVE)
39
-- add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE2
40
-- elseif(CPU_HAS_SVE OR CROSS_COMPILE_SVE)
41
-- message(STATUS "Found SVE")
42
--- set(ARM_ARGS -O3 -march=armv8-a+sve -fPIC -flax-vector-conversions)
43
--+ set(ARM_ARGS -fPIC -flax-vector-conversions)
44
-- add_definitions(-DHAVE_SVE)
45
-- add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE
46
-- elseif(CPU_HAS_NEON)
47
-+ if(ARM64)
48
-+--- a/source/cmake/FindNEON_DOTPROD.cmake
49
-++++ b/source/cmake/FindNEON_DOTPROD.cmake
50
-+@@ -17,5 +17,5 @@
51
-+ endif()
52
-+
53
-+ if(has_dot_product)
54
-+- set(CPU_HAS_NEON_DOTPROD 1)
55
-++ set(CPU_HAS_NEON_DOTPROD 0)
56
-+ endif()
57
-+--- a/source/cmake/FindNEON_I8MM.cmake
58
-++++ b/source/cmake/FindNEON_I8MM.cmake
59
-+@@ -17,5 +17,5 @@
60
-+ endif()
61
-+
62
-+ if(has_i8mm)
63
-+- set(CPU_HAS_NEON_I8MM 1)
64
-++ set(CPU_HAS_NEON_I8MM 0)
65
-+ endif()
66
-+--- a/source/cmake/FindSVE.cmake
67
-++++ b/source/cmake/FindSVE.cmake
68
-+@@ -17,5 +17,5 @@
69
-+ endif()
70
-+
71
-+ if(sve_version)
72
-+- set(CPU_HAS_SVE 1)
73
-++ set(CPU_HAS_SVE 0)
74
-+ endif()
75
-+--- a/source/cmake/FindSVE2.cmake
76
-++++ b/source/cmake/FindSVE2.cmake
77
-+@@ -17,6 +17,6 @@
78
-+ endif()
79
-+
80
-+ if(sve2_version)
81
-+- set(CPU_HAS_SVE 1)
82
-+- set(CPU_HAS_SVE2 1)
83
-++ set(CPU_HAS_SVE 0)
84
-++ set(CPU_HAS_SVE2 0)
85
-+ endif()
86
---- 0004-Do-not-build-with-assembly-support-on-arm.patch.orig
87
-+++ 0004-Do-not-build-with-assembly-support-on-arm.patch
88
-@@ -3,14 +3,12 @@ Date: Fri, 31 May 2024 23:38:23 +0200
89
- Subject: Do not build with assembly support on arm*
90
-
91
- ---
92
-- source/CMakeLists.txt | 9 ---------
93
-+ source/CMakeLists.txt | 9 ---------
94
- 1 file changed, 9 deletions(-)
95
-
96
--diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
97
--index 672cc2d..f112330 100755
98
- --- a/source/CMakeLists.txt
99
- +++ b/source/CMakeLists.txt
100
--@@ -73,15 +73,6 @@ elseif(POWERMATCH GREATER "-1")
101
-+@@ -72,15 +72,6 @@
102
- add_definitions(-DPPC64=1)
103
- message(STATUS "Detected POWER PPC64 target processor")
104
- endif()
105
-@@ -24,5 +22,5 @@ index 672cc2d..f112330 100755
106
- - set(ARM 1)
107
- - add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
108
- elseif(ARM64MATCH GREATER "-1")
109
-- #if(CROSS_COMPILE_ARM64)
110
-- #message(STATUS "Cross compiling for ARM64 arch")
111
-+ message(STATUS "Detected ARM64 target processor")
112
-+ set(ARM64 1)
113
---- baselibs.conf.orig
114
-+++ baselibs.conf
115
-@@ -1 +1 @@
116
--libx265-209
117
-+libx265-215
118
---- update.sh.orig
119
-+++ update.sh
120
-@@ -1,10 +1,13 @@
121
--#!/bin/sh
122
-+#!/bin/bash
123
-
124
--rm -f x265_*.tar.gz
125
--osc service disabledrun download_files
126
-+rm -f x265_*.tar x265_*.tar.*z
127
-+osc service ra
128
- version=$(grep ^Version x265.spec|awk '{print $2}')
129
- echo "The new version is:" $version
130
--api=$(tar xzfO x265_${version}.tar.gz x265_${version}/source/CMakeLists.txt|grep "set(X265_BUILD"|sed 's/^.* \(1-90-9*\).*$/\1/')
131
-+api=$(tar xafO x265-${version}.tar x265-${version}/source/CMakeLists.txt|grep "set(X265_BUILD"|sed 's/^.* \(1-90-9*\).*$/\1/')
132
- echo "The new api version is:" $api
133
- echo "libx265-${api}" > baselibs.conf
134
--sed -i "/^%define sover/c%define sover ${api}" x265.spec
135
-+sed -i "
136
-+/^%define sover:blank:/c%define sover ${api}
137
-+ /^%define uver:blank:/c%define uver ${version//./_}
138
-+" x265.spec
139
---- x265.changes.orig
140
-+++ x265.changes
141
-@@ -1,4 +1,10 @@
142
- -------------------------------------------------------------------
143
-+Mon Mar 3 03:03:03 UTC 2025 - olaf@aepfle.de
144
-+
145
-+- Update to version 4.1
146
-+ see included releasenotes.rst for details
147
-+
148
-+-------------------------------------------------------------------
149
- Thu Jun 13 05:58:19 UTC 2024 - Luigi Baldoni <aloisio@gmx.com>
150
-
151
- - Update to version 3.6
152
---- x265.pkgconfig.patch.orig
153
-+++ x265.pkgconfig.patch
154
-@@ -1,3 +1,7 @@
155
-+---
156
-+ source/x265.pc.in | 2 +-
157
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
158
-+
159
- --- a/source/x265.pc.in
160
- +++ b/source/x265.pc.in
161
- @@ -1,6 +1,6 @@
162
---- x265.spec.orig
163
-+++ x265.spec
164
-@@ -17,18 +17,18 @@
165
- #
166
-
167
-
168
--%define sover 209
169
--%define libname lib%{name}
170
-+%define sover 215
171
-+%define libname lib%name
172
- %define libsoname %{libname}-%{sover}
173
--%define uver 3_6
174
-+%define uver 4_1
175
- Name: x265
176
--Version: 3.6
177
-+Version: 4.1
178
- Release: 0
179
- Summary: A free h265/HEVC encoder - encoder binary
180
- License: GPL-2.0-or-later
181
--Group: Productivity/Multimedia/Video/Editors and Convertors
182
- URL: https://bitbucket.org/multicoreware/x265_git
183
--Source0: https://bitbucket.org/multicoreware/x265_git/downloads/%{name}_%{version}.tar.gz
184
-+Source0: %name-%version.tar
185
-+Patch0: %name.patch
186
- Patch1: x265.pkgconfig.patch
187
- Patch3: 0001-Fix-arm-flags.patch
188
- Patch4: 0004-Do-not-build-with-assembly-support-on-arm.patch
189
-@@ -36,13 +36,8 @@ BuildRequires: cmake
190
- %if 0%{?suse_version} > 1500
191
- BuildRequires: gcc-c++
192
- %else
193
--%if 0%{?sle_version} > 150500
194
- BuildRequires: gcc13
195
- BuildRequires: gcc13-c++
196
--%else
197
--BuildRequires: gcc10
198
--BuildRequires: gcc10-c++
199
--%endif
200
- %endif
201
x265.patch
Deleted
17
1
2
----
3
- source/CMakeLists.txt | 2 +-
4
- 1 file changed, 1 insertion(+), 1 deletion(-)
5
-
6
---- a/source/CMakeLists.txt
7
-+++ b/source/CMakeLists.txt
8
-@@ -13,7 +13,7 @@
9
- cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
10
- endif()
11
- if(POLICY CMP0054)
12
-- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
13
-+ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
14
- endif()
15
-
16
- project (x265)
17
_link
Changed
9
1
2
-<link project="Essentials" cicount="add" baserev="fe6a80b8d11ca4c423f3b8f1e0061f03">
3
- <patches>
4
- <delete name="x265_3.6.tar.gz"/>
5
- <apply name="project.diff"/>
6
- </patches>
7
-</link>
8
+<link project="Essentials" cicount="add"/>
9
_service
Deleted
47
1
2
-<services>
3
- <service name="tar_scm" mode="manual">
4
- <param name="exclude">.gitignore</param>
5
- <param name="exclude">.hgignore</param>
6
- <param name="exclude">.hgtags</param>
7
- <param name="exclude">.readthedocs.yaml</param>
8
- <param name="exclude">build/README.txt</param>
9
- <param name="exclude">build/aarch64-darwin</param>
10
- <param name="exclude">build/aarch64-linux-clang</param>
11
- <param name="exclude">build/ms*</param>
12
- <param name="exclude">build/vc*</param>
13
- <param name="exclude">build/xcode</param>
14
- <param name="exclude">build</param>
15
- <param name="exclude">doc/intra</param>
16
- <param name="exclude">doc/reST/Makefile</param>
17
- <param name="exclude">doc/reST/api.rst</param>
18
- <param name="exclude">doc/reST/cli.rst</param>
19
- <param name="exclude">doc/reST/conf.py</param>
20
- <param name="exclude">doc/reST/index.rst</param>
21
- <param name="exclude">doc/reST/introduction.rst</param>
22
- <param name="exclude">doc/reST/lossless.rst</param>
23
- <param name="exclude">doc/reST/presets.rst</param>
24
- <param name="exclude">doc/reST/svthevc.rst</param>
25
- <param name="exclude">doc/reST/threading.rst</param>
26
- <param name="exclude">doc/reST/x265.rst</param>
27
- <param name="exclude">doc/requirements.txt</param>
28
- <param name="exclude">doc/uncrustify</param>
29
- <param name="exclude">readme.rst</param>
30
- <param name="exclude">source/common/ppc</param>
31
- <param name="exclude">source/compat</param>
32
- <param name="exclude">source/profile</param>
33
- <param name="exclude">source/test</param>
34
- <param name="filename">x265</param>
35
- <param name="revision">32e25ffcf810c5fe284901859b369270824c4596</param>
36
- <param name="scm">git</param>
37
- <param name="submodules">disable</param>
38
- <param name="url">https://bitbucket.org/multicoreware/x265_git.git</param>
39
- <param name="versionformat">@PARENT_TAG@</param>
40
- <param name="versionrewrite-pattern">v?(^\++)(.*)</param>
41
- <param name="versionrewrite-replacement">\1</param>
42
- </service>
43
- <service name="set_version" mode="manual">
44
- <param name="basename">x265</param>
45
- </service>
46
-</services>
47
x265-4.1.tar
Deleted