Hi Vasyl On 2021-05-18 19:50:16 +0000, Vasyl Gello wrote: > Hi Sebastian! > > > The diff did not make it to the list which is a sign that it's to big. > > Please prepare a filtered diff with the relevant changes. > > Please clarify: do you want me to discard 19.1 source and start > cherry-picking selected stuff into 19.0? > > Or you just want me to revert that ffmpeg downgrader patch? And, possibly, > reuse older versions of libdvdnav / read etc?
Yes, please revert the ffmpeg patch. I propose the following (similar to spamassassin in #988611): * Prepare 2:19.0+dfsg1-2 with the fix for #985497 and cherry-pick important and targetted fixes from 19.1. * Once that version migrated, let's take a look at the remaining diff from -2 to 19.1. Cheers > -- > Vasyl Gello > ================================================== > Certified SolidWorks Expert > > Mob.:+380 (98) 465 66 77 > > E-Mail: vasek.ge...@gmail.com > > Skype: vasek.gello > ================================================== > 호랑이는 죽어서 가죽을 남기고 사람은 죽어서 이름을 남긴다 > > 18 травня 2021 р. 19:04:16 UTC, Sebastian Ramacher <sramac...@debian.org> > написав(-ла): > >Control: tags -1 moreinfo > > > >On 2021-05-18 07:17:51 +0000, Vasyl Gello wrote: > >> Dear colleagues, > >> > >> As Sebastian pointed in #988615, let me expand why the package is an > >> improvement for bullseye. > >> > >> The 19.1 point release has 80 bug fixes > >> (https://github.com/xbmc/xbmc/milestone/141?closed=1). > >> Most notable ones are: > >> > >> * [Linux] Fix playback of optical DVDs > >> * [Linux] Fix text issues when turning on / off TVs > >> * [Music][Backport]Make MySQL native sorting functions more robust > >> * DNSNameCache: only use a reachable address listed by nmblookup (a > >> critical functionality regression for Samba users!) > >> * [Backport][PVR][GUI] Channel manager does not rename backend channel > >> when supported > >> > >> Picking only these chains still results in ~80% of 19.0 -> 19.1 debdiff, > >> so I expect approving the request as I tested it. > > > >The diff did not make it to the list which is a sign that it's to big. > >Please prepare a filtered diff with the relevant changes. > > > >I had a first glance at the diff in the BTS. > > > >diff -Nru kodi-19.0+dfsg1/debian/control kodi-19.1+dfsg1/debian/control > >--- kodi-19.0+dfsg1/debian/control 2021-02-19 00:02:45.000000000 +0000 > >+++ kodi-19.1+dfsg1/debian/control 2021-05-15 21:15:26.000000000 +0000 > >@@ -24,10 +24,10 @@ > > libass-dev, > > libavahi-client-dev, > > libavahi-common-dev, > >- libavcodec-dev (>= 7:4.2.2), > >- libavfilter-dev (>= 7:4.2.2), > >- libavformat-dev (>= 7:4.2.2), > >- libavutil-dev (>= 7:4.2.2), > >+ libavcodec-dev (>= 7:4.1.6~), > >+ libavfilter-dev (>= 7:4.1.6~), > >+ libavformat-dev (>= 7:4.1.6~), > >+ libavutil-dev (>= 7:4.1.6~), > > libbluetooth-dev, > > libbluray-dev (>= 1:0.7.0), > > libcap-dev, > >@@ -57,7 +57,7 @@ > > libglu1-mesa-dev | libglu-dev, > > libgnutls28-dev, > > libgpg-error-dev, > >- libgtest-dev, > >+ libgtest-dev (>= 1.10.0~), > > libinput-dev, > > libiso9660-dev, > > libiso9660++-dev, > >@@ -72,7 +72,7 @@ > > libpcre3-dev, > > libplist-dev, > > libpng-dev, > >- libpostproc-dev (>= 7:4.2.2), > >+ libpostproc-dev (>= 7:4.1.6~), > > libpulse-dev, > > librsvg2-bin, > > libshairplay-dev (>= 0.9.0~), > >@@ -80,8 +80,8 @@ > > libsndio-dev, > > libspdlog-dev (>= 1:1.5.0), > > libsqlite3-dev, > >- libswresample-dev (>= 7:4.2.2), > >- libswscale-dev (>= 7:4.2.2), > >+ libswresample-dev (>= 7:4.1.6~), > >+ libswscale-dev (>= 7:4.1.6~), > > libtag1-dev (>= 1.8), > > libtinyxml-dev, > > libtool, > >diff -Nru > >kodi-19.0+dfsg1/debian/patches/backports/0001-Downgrade-ffmpeg-to-4.1.6.patch > > > >kodi-19.1+dfsg1/debian/patches/backports/0001-Downgrade-ffmpeg-to-4.1.6.patch > >--- > >kodi-19.0+dfsg1/debian/patches/backports/0001-Downgrade-ffmpeg-to-4.1.6.patch > > 1970-01-01 00:00:00.000000000 +0000 > >+++ > >kodi-19.1+dfsg1/debian/patches/backports/0001-Downgrade-ffmpeg-to-4.1.6.patch > > 2021-05-15 21:15:26.000000000 +0000 > >@@ -0,0 +1,31 @@ > >+Author: Vasyl Gello <vasek.ge...@gmail.com> > >+Forwarded: not-needed > >+Subject: Downgrade ffmpeg to 4.1.6 > >+ > >+--- > >+ > >+--- a/cmake/modules/FindFFMPEG.cmake > >++++ b/cmake/modules/FindFFMPEG.cmake > >+@@ -33,14 +33,14 @@ > >+ # > >+ > >+ # required ffmpeg library versions > >+-set(REQUIRED_FFMPEG_VERSION 4.3) > >+-set(_avcodec_ver ">=58.91.100") > >+-set(_avfilter_ver ">=7.85.100") > >+-set(_avformat_ver ">=58.45.100") > >+-set(_avutil_ver ">=56.51.100") > >+-set(_swscale_ver ">=5.7.100") > >+-set(_swresample_ver ">=3.7.100") > >+-set(_postproc_ver ">=55.7.100") > >++set(REQUIRED_FFMPEG_VERSION 4.1) > >++set(_avcodec_ver ">=58.35.100") > >++set(_avfilter_ver ">=7.40.101") > >++set(_avformat_ver ">=58.20.100") > >++set(_avutil_ver ">=56.22.100") > >++set(_swscale_ver ">=5.3.100") > >++set(_swresample_ver ">=3.3.100") > >++set(_postproc_ver ">=55.3.100") > >+ > >+ > >+ # Allows building with external ffmpeg not found in system paths, > > > >That's unnecessary noise and not relevant for bullseye. Please revert. > > > >The new upstream release also constains new upstream releases of > >libdvdread and libdvdnav. This releases also reinvents kodi's logging. > >So some of those changes definitely do not look like targetted fixes to > >me. > > > >Cheers > > > > > >> > >> On Debian side, the release incorporates two Debian bug fixes and the fix > >> for regression that smashed user input of date in PVR search box. > >> The latter bug was reported not via Debian but it took me several evenings > >> to hunt down :) > >> > >> The release is tested using amd64 / i386 LXC containers and no issues > >> spotted so far. > >> -- > >> Vasyl Gello > >> ================================================== > >> Certified SolidWorks Expert > >> > >> Mob.:+380 (98) 465 66 77 > >> > >> E-Mail: vasek.ge...@gmail.com > >> > >> Skype: vasek.gello > >> ================================================== > >> 호랑이는 죽어서 가죽을 남기고 사람은 죽어서 이름을 남긴다 > > > >-- > >Sebastian Ramacher -- Sebastian Ramacher
signature.asc
Description: PGP signature