diff -Nru avifile-0.7.48~20090503.ds/debian/changelog avifile-0.7.48~20090503.ds/debian/changelog --- avifile-0.7.48~20090503.ds/debian/changelog 2020-03-22 15:34:13.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/changelog 2020-09-29 19:28:20.000000000 +0000 @@ -1,20 +1,15 @@ -avifile (1:0.7.48~20090503.ds-20.1build3) focal; urgency=medium +avifile (1:0.7.48~20090503.ds-21) unstable; urgency=low - * No-change rebuild for libgcc-s1 package name change. + [ Ying-Chun Liu (PaulLiu) ] + * Use libswresample-dev instead of libavresample-dev (Closes: #971333) + - Update debian/patches/libav10.patch + * Bump debhelper version to 11 + * Bump Standards-Version to 4.5.0: nothing needs to be changed - -- Matthias Klose Sun, 22 Mar 2020 16:34:13 +0100 + [ Helmut Grohne ] + * Fix FTCBFS: Explicitly disable --without-xvid4. (Closes: #922150) -avifile (1:0.7.48~20090503.ds-20.1build2) eoan; urgency=medium - - * No-change upload with strops.h and sys/strops.h removed in glibc. - - -- Matthias Klose Thu, 05 Sep 2019 10:31:36 +0000 - -avifile (1:0.7.48~20090503.ds-20.1build1) cosmic; urgency=medium - - * No-change rebuild for ffmpeg soname changes. - - -- Matthias Klose Thu, 19 Jul 2018 08:42:31 +0000 + -- Ying-Chun Liu (PaulLiu) Wed, 30 Sep 2020 03:28:20 +0800 avifile (1:0.7.48~20090503.ds-20.1) unstable; urgency=medium diff -Nru avifile-0.7.48~20090503.ds/debian/compat avifile-0.7.48~20090503.ds/debian/compat --- avifile-0.7.48~20090503.ds/debian/compat 2014-10-20 11:28:43.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/compat 2020-09-29 06:39:09.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru avifile-0.7.48~20090503.ds/debian/control avifile-0.7.48~20090503.ds/debian/control --- avifile-0.7.48~20090503.ds/debian/control 2017-07-25 17:10:29.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/control 2020-09-29 19:28:20.000000000 +0000 @@ -2,13 +2,13 @@ Section: libs Priority: optional Maintainer: Ying-Chun Liu (PaulLiu) -Standards-Version: 4.0.0 +Standards-Version: 4.5.0 Build-Depends: automake, - debhelper (>= 9), + debhelper (>= 11), dh-exec, liba52-dev, libavformat-dev (>= 6:10~), - libavresample-dev (>= 6:10~), + libswresample-dev (>= 6:10~), libjpeg-dev, libogg-dev, libsdl1.2-dev, diff -Nru avifile-0.7.48~20090503.ds/debian/patches/libav10.patch avifile-0.7.48~20090503.ds/debian/patches/libav10.patch --- avifile-0.7.48~20090503.ds/debian/patches/libav10.patch 2016-08-16 07:14:12.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/patches/libav10.patch 2020-09-29 05:27:25.000000000 +0000 @@ -92,7 +92,7 @@ avcodec_close(m_pAvContext); free(m_pAvContext); } -+ avresample_free(&avr); ++ swr_free(&avr); + av_frame_free(&frame); } @@ -131,9 +131,9 @@ + if (hr >= 0 && got_output) { + if (!avr || frame->format != resample_format || + frame->sample_rate != resample_rate || frame->channel_layout != resample_layout) { -+ avresample_free(&avr); ++ swr_free(&avr); + -+ avr = avresample_alloc_context(); ++ avr = swr_alloc(); + if (!avr) + return -1; + @@ -144,9 +144,9 @@ + av_opt_set_int(avr, "in_sample_rate", frame->sample_rate, 0); + av_opt_set_int(avr, "out_sample_rate", frame->sample_rate, 0); + -+ hr = avresample_open(avr); ++ hr = swr_init(avr); + if (hr < 0) { -+ avresample_free(&avr); ++ swr_free(&avr); + return -1; + } + resample_format = frame->format; @@ -154,8 +154,8 @@ + resample_layout = frame->channel_layout; + } + -+ hr = avresample_convert(avr, (uint8_t**)&out_data, out_size, frame->nb_samples, -+ frame->extended_data, frame->linesize[0], frame->nb_samples); ++ hr = swr_convert(avr, (uint8_t**)&out_data, frame->nb_samples, ++ (const uint8_t**) frame->extended_data, frame->nb_samples); + if (hr < 0) + return -1; + @@ -184,7 +184,7 @@ #include "avm_avformat.h" +extern "C" { -+#include ++#include +#include +} + @@ -196,7 +196,7 @@ AVCodec *m_pAvCodec; AVCodecContext* m_pAvContext; + AVFrame *frame; -+ AVAudioResampleContext *avr; ++ SwrContext *avr; + int resample_format; + int resample_rate; + uint64_t resample_layout; @@ -235,7 +235,7 @@ FFMPEG_CFLAGS = -I$(top_srcdir)/ffmpeg -ffmpeg_la_LIBADD = ../../lib/libaviplay.la -lavcodec -lavformat -lavutil -+ffmpeg_la_LIBADD = ../../lib/libaviplay.la -lavcodec -lavformat -lavresample -lavutil ++ffmpeg_la_LIBADD = ../../lib/libaviplay.la -lavcodec -lavformat -lswresample -lavutil ffmpeg_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) $(FFMPEG_CFLAGS) diff -Nru avifile-0.7.48~20090503.ds/debian/rules avifile-0.7.48~20090503.ds/debian/rules --- avifile-0.7.48~20090503.ds/debian/rules 2014-10-20 11:28:43.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/rules 2020-09-29 19:28:20.000000000 +0000 @@ -52,15 +52,17 @@ @rm -rf debian/docs .snprj build-stamp configure-stamp dh_clean acinclude.m4 +override_dh_autoreconf: + dh_autoreconf ./autogen.sh -- --clean + override_dh_auto_configure: dh_testdir @echo "---=== Debian package is build with Lame support ===---" @echo " library is being linked at runtime" @echo "for the full usage user has to install mp3lame library" - ./autogen.sh --clean dh_auto_configure -- --prefix=/usr --without-lame \ --enable-lamebin --without-mad --enable-quiet --enable-release \ - --without-qt \ + --without-qt --without-xvid4 \ --disable-dependency-tracking $(CROSS) CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"