diff -Nru lynkeos.app-3.4+dfsg1/debian/changelog lynkeos.app-3.4+dfsg1/debian/changelog --- lynkeos.app-3.4+dfsg1/debian/changelog 2022-01-04 12:03:49.000000000 +0000 +++ lynkeos.app-3.4+dfsg1/debian/changelog 2022-02-13 20:41:16.000000000 +0000 @@ -1,8 +1,12 @@ -lynkeos.app (3.4+dfsg1-3build1) jammy; urgency=medium +lynkeos.app (3.4+dfsg1-4) unstable; urgency=medium - * No-change rebuild against libgnustep-base1.28 + * debian/patches/ffmpeg-5.0.patch: New; fix FTBFS with ffmpeg/5.0 + (Closes: #1004766). + * debian/patches/gnustep-port.patch: Fix incorrect block malloc size. + * debian/patches/series: Update. + * debian/copyright: Update copyright years. - -- Graham Inggs Tue, 04 Jan 2022 12:03:49 +0000 + -- Yavor Doganov Sun, 13 Feb 2022 22:41:16 +0200 lynkeos.app (3.4+dfsg1-3) unstable; urgency=medium diff -Nru lynkeos.app-3.4+dfsg1/debian/copyright lynkeos.app-3.4+dfsg1/debian/copyright --- lynkeos.app-3.4+dfsg1/debian/copyright 2021-01-24 18:29:21.000000000 +0000 +++ lynkeos.app-3.4+dfsg1/debian/copyright 2022-02-13 20:40:48.000000000 +0000 @@ -29,7 +29,7 @@ License: BSD-3-clause Files: debian/* -Copyright: 2005-2021 Debian GNUstep maintainers +Copyright: 2005-2022 Debian GNUstep maintainers 2006 Julien Danjou 2018 Frédéric Bonnard License: GPL-2+ diff -Nru lynkeos.app-3.4+dfsg1/debian/patches/ffmpeg-5.0.patch lynkeos.app-3.4+dfsg1/debian/patches/ffmpeg-5.0.patch --- lynkeos.app-3.4+dfsg1/debian/patches/ffmpeg-5.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ lynkeos.app-3.4+dfsg1/debian/patches/ffmpeg-5.0.patch 2022-02-11 11:01:53.000000000 +0000 @@ -0,0 +1,97 @@ +Description: Fix FTBFS with ffmpeg/5.0. +Bug-Debian: https://bugs.debian.org/1004766 +Author: Yavor Doganov +Forwarded: no +Last-Update: 2022-02-11 +--- + +--- lynkeos.app.orig/application/Sources/FFmpegReader.h ++++ lynkeos.app/application/Sources/FFmpegReader.h +@@ -74,7 +74,7 @@ + u_short *_convBuffer; //!< Temporary buffer for conversion + int _bufLineLength; //= 0 && (_packet.stream_index != _videoStream ) ); ++ } while( ret >= 0 && (_packet->stream_index != _videoStream ) ); + + if ( ret < 0 ) + { +@@ -136,7 +136,7 @@ + { + case DataNeeded: + case DataRepeat: +- pk = &_packet; ++ pk = _packet; + break; + case EndOfFile: + // We will send a *last* NULL packet +@@ -213,9 +213,9 @@ + || _times[index].keyFrame != _times[_nextIndex].keyFrame ) + { + // Reset the decoder +- if ( _packet.data != NULL ) +- av_packet_unref( &_packet ); +- _packet.size = 0; ++ if ( _packet->data != NULL ) ++ av_packet_unref( _packet ); ++ _packet->size = 0; + avcodec_flush_buffers(_pCodecCtx); + _decoderState = DataNeeded; + +@@ -284,8 +284,6 @@ + + + (void) load // It has the added benefit to force the runtime to load the class + { +- // Register all formats and codecs +- av_register_all(); + } + + + (void) lynkeosFileTypes:(NSArray**)fileTypes +@@ -339,9 +337,7 @@ + _convBuffer = NULL; + _bufLineLength = 0; + _videoStream = -1; +- av_init_packet(&_packet); +- _packet.data = NULL; +- _packet.size = 0; ++ _packet = av_packet_alloc(); + _decoderState = DataNeeded; + _numberOfFrames = 0; + _nextIndex = 0; +@@ -355,7 +351,7 @@ + { + unsigned int i; + int ret; +- AVCodec *pCodec; ++ const AVCodec *pCodec; + AVCodecParameters *codecParams; + u_long arraySize; + BOOL validFrame; +@@ -545,8 +541,7 @@ + sws_freeContext( _procConverter ); + if (_convBuffer != NULL) + free(_convBuffer); +- if ( _packet.data != NULL ) +- av_packet_unref( &_packet ); ++ av_packet_free( &_packet ); + if ( _pFormatCtx != NULL ) + avformat_close_input( &_pFormatCtx ); + if ( _times != NULL ) diff -Nru lynkeos.app-3.4+dfsg1/debian/patches/gnustep-port.patch lynkeos.app-3.4+dfsg1/debian/patches/gnustep-port.patch --- lynkeos.app-3.4+dfsg1/debian/patches/gnustep-port.patch 2021-10-27 13:59:29.000000000 +0000 +++ lynkeos.app-3.4+dfsg1/debian/patches/gnustep-port.patch 2022-02-13 20:31:09.000000000 +0000 @@ -28,7 +28,7 @@ Bug-Debian: https://bugs.debian.org/920609 Author: Yavor Doganov Forwarded: no -Last-Update: 2021-10-27 +Last-Update: 2022-02-13 --- --- lynkeos.app.orig/application/GNUstep/GNUmakefile @@ -200,7 +200,7 @@ + /* Memory leak here -- I couldn't find a way to solve it. In + * practice it's not a problem because the program terminates + * so all memory is returned to the system. */ -+ block = malloc(sizeof(GSNotificationBlock)); ++ block = malloc(sizeof(*block)); + block->invoke = blockfunc; + RETAIN(wisdomFile); +#endif diff -Nru lynkeos.app-3.4+dfsg1/debian/patches/series lynkeos.app-3.4+dfsg1/debian/patches/series --- lynkeos.app-3.4+dfsg1/debian/patches/series 2021-01-24 16:44:47.000000000 +0000 +++ lynkeos.app-3.4+dfsg1/debian/patches/series 2022-02-10 14:55:33.000000000 +0000 @@ -4,3 +4,4 @@ gcc-warnings.patch glibc-2.27.patch ftbfs-ppc64el.patch +ffmpeg-5.0.patch