automatic version update by autodist [release 35.0-1mamba;Thu Feb 27 2025]
This commit is contained in:
parent
3a6e28e67d
commit
335eae8876
@ -1,79 +0,0 @@
|
||||
--- FFmpeg/libavcodec/libx265.c.x265-4.0 2024-02-13 15:03:25.000000000 +0100
|
||||
+++ FFmpeg/libavcodec/libx265.c 2024-11-11 09:41:23.812186607 +0100
|
||||
@@ -504,7 +504,13 @@
|
||||
{
|
||||
libx265Context *ctx = avctx->priv_data;
|
||||
x265_picture x265pic;
|
||||
- x265_picture x265pic_out = { 0 };
|
||||
+#if X265_BUILD >= 210
|
||||
+ x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
|
||||
+ x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
|
||||
+#else
|
||||
+ x265_picture x265pic_solo_out = { 0 };
|
||||
+#endif
|
||||
+ x265_picture* x265pic_out;
|
||||
x265_nal *nal;
|
||||
uint8_t *dst;
|
||||
int pict_type;
|
||||
@@ -575,8 +581,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#if X265_BUILD >= 210
|
||||
+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
|
||||
+ x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
|
||||
+
|
||||
+ ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
|
||||
+ pic ? &x265pic : NULL, x265pic_lyrptr_out);
|
||||
+#else
|
||||
ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
|
||||
- pic ? &x265pic : NULL, &x265pic_out);
|
||||
+ pic ? &x265pic : NULL, &x265pic_solo_out);
|
||||
+#endif
|
||||
|
||||
av_freep(&x265pic.quantOffsets);
|
||||
|
||||
@@ -604,10 +618,16 @@
|
||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||
}
|
||||
|
||||
- pkt->pts = x265pic_out.pts;
|
||||
- pkt->dts = x265pic_out.dts;
|
||||
+#if X265_BUILD >= 210
|
||||
+ x265pic_out = x265pic_lyrptr_out[0];
|
||||
+#else
|
||||
+ x265pic_out = &x265pic_solo_out;
|
||||
+#endif
|
||||
+
|
||||
+ pkt->pts = x265pic_out->pts;
|
||||
+ pkt->dts = x265pic_out->dts;
|
||||
|
||||
- switch (x265pic_out.sliceType) {
|
||||
+ switch (x265pic_out->sliceType) {
|
||||
case X265_TYPE_IDR:
|
||||
case X265_TYPE_I:
|
||||
pict_type = AV_PICTURE_TYPE_I;
|
||||
@@ -625,17 +645,17 @@
|
||||
}
|
||||
|
||||
#if X265_BUILD >= 130
|
||||
- if (x265pic_out.sliceType == X265_TYPE_B)
|
||||
+ if (x265pic_out->sliceType == X265_TYPE_B)
|
||||
#else
|
||||
- if (x265pic_out.frameData.sliceType == 'b')
|
||||
+ if (x265pic_out->frameData.sliceType == 'b')
|
||||
#endif
|
||||
pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
|
||||
|
||||
- ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
|
||||
+ ff_side_data_set_encoder_stats(pkt, x265pic_out->frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
|
||||
|
||||
- if (x265pic_out.userData) {
|
||||
- memcpy(&avctx->reordered_opaque, x265pic_out.userData, sizeof(avctx->reordered_opaque));
|
||||
- av_freep(&x265pic_out.userData);
|
||||
+ if (x265pic_out->userData) {
|
||||
+ memcpy(&avctx->reordered_opaque, x265pic_out->userData, sizeof(avctx->reordered_opaque));
|
||||
+ av_freep(&x265pic_out->userData);
|
||||
} else
|
||||
avctx->reordered_opaque = 0;
|
||||
|
||||
21
mythtv.spec
21
mythtv.spec
@ -1,8 +1,8 @@
|
||||
%define MAJver %(echo %version | cut -d. -f1)
|
||||
%define majver %(echo %version | cut -d. -f1-2)
|
||||
Name: mythtv
|
||||
Version: 34.0
|
||||
Release: 3mamba
|
||||
Version: 35.0
|
||||
Release: 1mamba
|
||||
Summary: A digital video recorder (DVR) application
|
||||
Group: Applications/Multimedia
|
||||
Vendor: openmamba
|
||||
@ -24,7 +24,6 @@ Source11: mythtv-mysql.txt
|
||||
Source12: mythtv-PACKAGE-LICENSING
|
||||
Patch1: mythtv-31.0-gcc-11.patch
|
||||
Patch3: mythtv-32.0-glibc-2.35.patch
|
||||
Patch5: mythtv-34.0-x265-4.0.patch
|
||||
License: GPL, LGPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -49,7 +48,7 @@ BuildRequires: libbluray-devel
|
||||
BuildRequires: libbzip2-devel
|
||||
BuildRequires: libdav1d-devel
|
||||
BuildRequires: libdrm-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libexiv2-devel
|
||||
BuildRequires: libfreetype-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libglvnd-devel
|
||||
@ -58,7 +57,6 @@ BuildRequires: libiec61883-devel
|
||||
BuildRequires: libjack-devel
|
||||
BuildRequires: liblame-devel
|
||||
BuildRequires: liblzma-devel
|
||||
BuildRequires: liblzo-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libperl
|
||||
BuildRequires: libpulseaudio-devel
|
||||
@ -168,8 +166,6 @@ Summary: Documentation for %{name}
|
||||
MythTV provides a unified graphical interface for recording and viewing television programs.
|
||||
This package contains the documentation for %{name},
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#-D -T
|
||||
@ -177,10 +173,6 @@ This package contains the documentation for %{name},
|
||||
%patch 1 -p1
|
||||
%patch 3 -p1
|
||||
|
||||
cd mythtv/external/FFmpeg
|
||||
%patch 5 -p1 -b .x265-4.0
|
||||
cd ../../..
|
||||
|
||||
rm -rf contrib/Win32 contrib/OSX
|
||||
#chmod -x themes/default/htmls/*.html
|
||||
|
||||
@ -349,8 +341,8 @@ rm -rf %{buildroot}%{_libdir}/mythtv/filters/*.*a
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/mythpython
|
||||
%{_bindir}/mythwikiscripts
|
||||
%dir %{python3_sitelib}/MythTV-%{version}.dist-info
|
||||
%{python3_sitelib}/MythTV-%{version}.dist-info/*
|
||||
%dir %{python3_sitelib}/mythtv-%{version}.dist-info
|
||||
%{python3_sitelib}/mythtv-%{version}.dist-info/*
|
||||
%dir %{python3_sitelib}/MythTV
|
||||
%{python3_sitelib}/MythTV/*
|
||||
|
||||
@ -360,6 +352,9 @@ rm -rf %{buildroot}%{_libdir}/mythtv/filters/*.*a
|
||||
##%doc contrib database
|
||||
|
||||
%changelog
|
||||
* Thu Feb 27 2025 Automatic Build System <autodist@openmamba.org> 35.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sun Nov 10 2024 Automatic Build System <autodist@mambasoft.it> 34.0-3mamba
|
||||
- rebuilt by autoport with build requirements: libx265-devel>=0:4.0-1mamba
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user