Apply FFMPEG-7 only on Fedora 41+
This commit is contained in:
parent
a3143a0e1d
commit
ba3b7a9dbc
2 changed files with 6 additions and 12 deletions
|
|
@ -125,14 +125,6 @@ index 6af88a5629..5df0c590c0 100644
|
|||
global GEN_TO_ENCODER
|
||||
encoder = GEN_TO_ENCODER.get(<uintptr_t> opaque)
|
||||
#log.warn("write_packet(%#x, %#x, %#x) encoder=%s", <uintptr_t> opaque, <uintptr_t> buf, buf_size, type(encoder))
|
||||
@@ -1146,6 +1158,7 @@ cdef int write_packet(void *opaque, uint8_t *buf, int buf_size) except 0:
|
||||
return -1
|
||||
return encoder.write_packet(<uintptr_t> buf, buf_size)
|
||||
|
||||
+
|
||||
MAX_WIDTH, MAX_HEIGHT = (4096, 4096)
|
||||
def get_specs(encoding, colorspace):
|
||||
assert encoding in get_encodings(), "invalid encoding: %s (must be one of %s" % (encoding, get_encodings())
|
||||
@@ -1504,7 +1517,7 @@ cdef class Encoder:
|
||||
self.audio_ctx.time_base.num = 1
|
||||
self.audio_ctx.bit_rate = 64000
|
||||
|
|
@ -162,6 +154,3 @@ index 6af88a5629..5df0c590c0 100644
|
|||
return buf_size
|
||||
--
|
||||
2.44.0
|
||||
|
||||
--- xpra/codecs/ffmpeg/decoder.pyx.orig 2024-10-11 13:55:29.562576235 +0100
|
||||
+++ xpra/codecs/ffmpeg/decoder.pyx 2024-10-11 14:00:42.835059698 +0100
|
||||
|
|
|
|||
|
|
@ -182,7 +182,12 @@ Xpra is usable over reasonably slow links and does its best to adapt to changing
|
|||
network bandwidth constraints.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
||||
%patch -P1 -p1
|
||||
%if 0%{?fedora} >= 41
|
||||
%patch -P2 -p1
|
||||
%endif
|
||||
|
||||
# cc1: error: unrecognized compiler option ‘-mfpmath=387’
|
||||
%ifarch %{arm}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue