Version in base suite: 3.0.18-0+deb11u1 Base version: vlc_3.0.18-0+deb11u1 Target version: vlc_3.0.20-0+deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/v/vlc/vlc_3.0.18-0+deb11u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/v/vlc/vlc_3.0.20-0+deb11u1.dsc /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ach.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/af.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/am.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/am_ET.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/an.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ar.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/as_IN.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ast.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/be.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/bg.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/bn.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/bn_IN.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/br.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/brx.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/bs.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ca.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ca@valencia.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/cgg.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/co.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/cs.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/cy.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/da.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/de.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/el.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/en_GB.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/eo.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/es.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/es_MX.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/et.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/eu.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/fa.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ff.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/fi.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/fr.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/fur.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/fy.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ga.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/gd.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/gl.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/gu.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/he.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/hi.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/hr.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/hu.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/hy.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/id.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ie.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/is.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/it.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ja.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ka.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/kab.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/kk.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/km.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/kn.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ko.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ks_IN.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ku_IQ.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ky.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/lg.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/lo.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/lt.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/lv.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/mai.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/mk.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ml.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/mn.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/mr.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ms.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/my.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/nb.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ne.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/nl.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/nn.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/oc.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/or_IN.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/pa.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/pl.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ps.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/pt_BR.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/pt_PT.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ro.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ru.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/si.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sk.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sl.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sm.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sq.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sr.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sv.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/sw.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ta.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/te.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/th.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/tr.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/tt.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/ug.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/uk.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/uz.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/vi.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/wa.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/zh_CN.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/zh_TW.gmo |binary /srv/release.debian.org/tmp/LskEPjlEce/vlc-3.0.20/po/zu.gmo |binary vlc-3.0.20/NEWS | 91 vlc-3.0.20/aclocal.m4 | 90 vlc-3.0.20/configure | 3275 - vlc-3.0.20/configure.ac | 46 vlc-3.0.20/contrib/src/aribb24/rules.mak | 2 vlc-3.0.20/contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch | 44 vlc-3.0.20/contrib/src/aribb25/0001-fix-build-script.patch | 70 vlc-3.0.20/contrib/src/aribb25/0002-fix-libs-include.patch | 25 vlc-3.0.20/contrib/src/aribb25/rules.mak | 6 vlc-3.0.20/contrib/src/ass/SHA512SUMS | 2 vlc-3.0.20/contrib/src/ass/rules.mak | 25 vlc-3.0.20/contrib/src/breakpad/rules.mak | 1 vlc-3.0.20/contrib/src/caca/rules.mak | 2 vlc-3.0.20/contrib/src/d3d11/rules.mak | 2 vlc-3.0.20/contrib/src/daala/rules.mak | 2 vlc-3.0.20/contrib/src/dav1d/SHA512SUMS | 2 vlc-3.0.20/contrib/src/dav1d/rules.mak | 2 vlc-3.0.20/contrib/src/ebml/SHA512SUMS | 2 vlc-3.0.20/contrib/src/ebml/rules.mak | 2 vlc-3.0.20/contrib/src/ffmpeg/SHA512SUMS | 1 vlc-3.0.20/contrib/src/ffmpeg/rules.mak | 27 vlc-3.0.20/contrib/src/fluidlite/rules.mak | 8 vlc-3.0.20/contrib/src/fribidi/rules.mak | 2 vlc-3.0.20/contrib/src/growl/rules.mak | 6 vlc-3.0.20/contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch | 67 vlc-3.0.20/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch | 25 vlc-3.0.20/contrib/src/harfbuzz/rules.mak | 4 vlc-3.0.20/contrib/src/jack/rules.mak | 2 vlc-3.0.20/contrib/src/libdsm/rules.mak | 2 vlc-3.0.20/contrib/src/main.mak | 4 vlc-3.0.20/contrib/src/mfx/rules.mak | 2 vlc-3.0.20/contrib/src/microdns/rules.mak | 2 vlc-3.0.20/contrib/src/mysofa/rules.mak | 2 vlc-3.0.20/contrib/src/nfs/rules.mak | 2 vlc-3.0.20/contrib/src/openjpeg/rules.mak | 2 vlc-3.0.20/contrib/src/protobuf/rules.mak | 2 vlc-3.0.20/contrib/src/pthreads/0001-headers-Update-to-Wine-master-and-regenerate-H-from-.patch | 62 vlc-3.0.20/contrib/src/pthreads/0002-headers-dxvahd-Regenerate-H-from-IDL.patch | 25 vlc-3.0.20/contrib/src/pthreads/rules.mak | 8 vlc-3.0.20/contrib/src/qt/0019-QFileSystemEngine-only-define-FILE_ID_INFO-for-build.patch | 36 vlc-3.0.20/contrib/src/qt/rules.mak | 1 vlc-3.0.20/contrib/src/smb2/rules.mak | 2 vlc-3.0.20/contrib/src/soxr/aarch64.patch | 21 vlc-3.0.20/contrib/src/soxr/rules.mak | 1 vlc-3.0.20/contrib/src/sparkle/rules.mak | 2 vlc-3.0.20/contrib/src/spatialaudio/rules.mak | 2 vlc-3.0.20/contrib/src/upnp/fix-reuseaddr-option.patch | 51 vlc-3.0.20/contrib/src/upnp/rules.mak | 7 vlc-3.0.20/contrib/src/vncclient/rules.mak | 2 vlc-3.0.20/contrib/src/vpx/SHA512SUMS | 2 vlc-3.0.20/contrib/src/vpx/libvpx-android.patch | 12 vlc-3.0.20/contrib/src/vpx/libvpx-darwin-aarch64.patch | 10 vlc-3.0.20/contrib/src/vpx/libvpx-ios.patch | 19 vlc-3.0.20/contrib/src/vpx/rules.mak | 4 vlc-3.0.20/contrib/src/zlib/SHA512SUMS | 2 vlc-3.0.20/contrib/src/zlib/rules.mak | 10 vlc-3.0.20/debian/changelog | 7 vlc-3.0.20/debian/patches/0001-configure-fix-linking-on-RISC-V-ISA.patch | 4 vlc-3.0.20/doc/ChangeLog-2003 | 10 vlc-3.0.20/doc/ChangeLog-2014 | 6 vlc-3.0.20/doc/ChangeLog-2022 | 1979 vlc-3.0.20/doc/ChangeLog-2023 | 2113 vlc-3.0.20/doc/Makefile.am | 1 vlc-3.0.20/doc/Makefile.in | 1 vlc-3.0.20/extras/analyser/vlc.vim | 2 vlc-3.0.20/extras/package/macosx/build.sh | 5 vlc-3.0.20/extras/package/win32/NSIS/vlc.win32.nsi.in | 4 vlc-3.0.20/extras/tools/SHA512SUMS | 2 vlc-3.0.20/extras/tools/packages.mak | 2 vlc-3.0.20/include/vlc_aout.h | 4 vlc-3.0.20/include/vlc_block.h | 20 vlc-3.0.20/include/vlc_codec.h | 6 vlc-3.0.20/include/vlc_common.h | 6 vlc-3.0.20/include/vlc_es_out.h | 10 vlc-3.0.20/include/vlc_events.h | 4 vlc-3.0.20/include/vlc_filter.h | 4 vlc-3.0.20/include/vlc_fixups.h | 6 vlc-3.0.20/include/vlc_input.h | 10 vlc-3.0.20/include/vlc_input_item.h | 10 vlc-3.0.20/include/vlc_interrupt.h | 4 vlc-3.0.20/include/vlc_media_library.h | 4 vlc-3.0.20/include/vlc_mtime.h | 16 vlc-3.0.20/include/vlc_picture.h | 4 vlc-3.0.20/include/vlc_picture_fifo.h | 6 vlc-3.0.20/include/vlc_playlist.h | 4 vlc-3.0.20/include/vlc_sout.h | 6 vlc-3.0.20/include/vlc_spu.h | 6 vlc-3.0.20/include/vlc_subpicture.h | 12 vlc-3.0.20/include/vlc_threads.h | 18 vlc-3.0.20/include/vlc_timestamp_helper.h | 4 vlc-3.0.20/include/vlc_vout.h | 4 vlc-3.0.20/include/vlc_vout_osd.h | 4 vlc-3.0.20/include/vlc_vout_wrapper.h | 4 vlc-3.0.20/lib/libvlc_internal.h | 6 vlc-3.0.20/lib/media_list_path.h | 13 vlc-3.0.20/lib/media_list_player.c | 37 vlc-3.0.20/modules/Makefile.in | 878 vlc-3.0.20/modules/access/alsa.c | 6 vlc-3.0.20/modules/access/avcapture.m | 24 vlc-3.0.20/modules/access/bluray.c | 16 vlc-3.0.20/modules/access/cdda.c | 16 vlc-3.0.20/modules/access/dcp/dcp.cpp | 8 vlc-3.0.20/modules/access/dcp/dcpparser.cpp | 6 vlc-3.0.20/modules/access/decklink.cpp | 6 vlc-3.0.20/modules/access/disc_helper.h | 2 vlc-3.0.20/modules/access/dshow/access.h | 4 vlc-3.0.20/modules/access/dshow/dshow.cpp | 18 vlc-3.0.20/modules/access/dshow/filter.cpp | 6 vlc-3.0.20/modules/access/dshow/filter.h | 4 vlc-3.0.20/modules/access/dtv/bdagraph.cpp | 2 vlc-3.0.20/modules/access/dtv/en50221.c | 10 vlc-3.0.20/modules/access/dvb/access.c | 6 vlc-3.0.20/modules/access/dvb/linux_dvb.c | 2 vlc-3.0.20/modules/access/dvb/scan.c | 10 vlc-3.0.20/modules/access/dvdnav.c | 14 vlc-3.0.20/modules/access/dvdread.c | 24 vlc-3.0.20/modules/access/http/hpackenc.c | 2 vlc-3.0.20/modules/access/http/message.h | 2 vlc-3.0.20/modules/access/idummy.c | 20 vlc-3.0.20/modules/access/imem.c | 22 vlc-3.0.20/modules/access/jack.c | 2 vlc-3.0.20/modules/access/linsys/linsys_hdsdi.c | 4 vlc-3.0.20/modules/access/linsys/linsys_sdi.c | 10 vlc-3.0.20/modules/access/live555.cpp | 58 vlc-3.0.20/modules/access/live555_dtsgen.h | 28 vlc-3.0.20/modules/access/mms/mmsh.c | 12 vlc-3.0.20/modules/access/mms/mmstu.h | 4 vlc-3.0.20/modules/access/oss.c | 6 vlc-3.0.20/modules/access/pulse.c | 4 vlc-3.0.20/modules/access/rdp.c | 4 vlc-3.0.20/modules/access/rtp/input.c | 10 vlc-3.0.20/modules/access/rtp/rtp.c | 2 vlc-3.0.20/modules/access/rtp/rtp.h | 4 vlc-3.0.20/modules/access/rtp/session.c | 16 vlc-3.0.20/modules/access/rtp/srtp.c | 2 vlc-3.0.20/modules/access/satip.c | 8 vlc-3.0.20/modules/access/screen/screen.h | 6 vlc-3.0.20/modules/access/screen/xcb.c | 2 vlc-3.0.20/modules/access/shm.c | 2 vlc-3.0.20/modules/access/smb2.c | 25 vlc-3.0.20/modules/access/srt.c | 2 vlc-3.0.20/modules/access/timecode.c | 14 vlc-3.0.20/modules/access/v4l2/demux.c | 2 vlc-3.0.20/modules/access/v4l2/lib.c | 8 vlc-3.0.20/modules/access/v4l2/radio.c | 2 vlc-3.0.20/modules/access/v4l2/v4l2.c | 2 vlc-3.0.20/modules/access/v4l2/v4l2.h | 9 vlc-3.0.20/modules/access/v4l2/video.c | 4 vlc-3.0.20/modules/access/vcd/cdrom.c | 6 vlc-3.0.20/modules/access/vcd/vcd.c | 4 vlc-3.0.20/modules/access/vnc.c | 4 vlc-3.0.20/modules/access/wasapi.c | 8 vlc-3.0.20/modules/access_output/livehttp.c | 24 vlc-3.0.20/modules/access_output/rist.c | 32 vlc-3.0.20/modules/access_output/shout.c | 4 vlc-3.0.20/modules/access_output/srt.c | 2 vlc-3.0.20/modules/access_output/udp.c | 16 vlc-3.0.20/modules/audio_filter/audiobargraph_a.c | 6 vlc-3.0.20/modules/audio_filter/channel_mixer/spatialaudio.cpp | 6 vlc-3.0.20/modules/audio_filter/chorus_flanger.c | 4 vlc-3.0.20/modules/audio_filter/converter/tospdif.c | 4 vlc-3.0.20/modules/audio_filter/resampler/soxr.c | 4 vlc-3.0.20/modules/audio_filter/stereo_widen.c | 2 vlc-3.0.20/modules/audio_output/Makefile.am | 2 vlc-3.0.20/modules/audio_output/alsa.c | 10 vlc-3.0.20/modules/audio_output/amem.c | 2 vlc-3.0.20/modules/audio_output/audiotrack.c | 34 vlc-3.0.20/modules/audio_output/audiounit_ios.m | 87 vlc-3.0.20/modules/audio_output/auhal.c | 12 vlc-3.0.20/modules/audio_output/coreaudio_common.c | 433 vlc-3.0.20/modules/audio_output/coreaudio_common.h | 12 vlc-3.0.20/modules/audio_output/directsound.c | 20 vlc-3.0.20/modules/audio_output/jack.c | 20 vlc-3.0.20/modules/audio_output/kai.c | 8 vlc-3.0.20/modules/audio_output/mmdevice.c | 68 vlc-3.0.20/modules/audio_output/mmdevice.h | 6 vlc-3.0.20/modules/audio_output/opensles_android.c | 4 vlc-3.0.20/modules/audio_output/oss.c | 6 vlc-3.0.20/modules/audio_output/pulse.c | 30 vlc-3.0.20/modules/audio_output/sndio.c | 6 vlc-3.0.20/modules/audio_output/tizen_audio.c | 2 vlc-3.0.20/modules/audio_output/vlcpulse.c | 10 vlc-3.0.20/modules/audio_output/vlcpulse.h | 2 vlc-3.0.20/modules/audio_output/wasapi.c | 2 vlc-3.0.20/modules/audio_output/waveout.c | 14 vlc-3.0.20/modules/audio_output/winstore.c | 7 vlc-3.0.20/modules/codec/Makefile.am | 16 vlc-3.0.20/modules/codec/adpcm.c | 8 vlc-3.0.20/modules/codec/aes3.c | 4 vlc-3.0.20/modules/codec/aom.c | 4 vlc-3.0.20/modules/codec/araw.c | 4 vlc-3.0.20/modules/codec/arib/substext.h | 4 vlc-3.0.20/modules/codec/audiotoolbox_midi.c | 8 vlc-3.0.20/modules/codec/avcodec/audio.c | 10 vlc-3.0.20/modules/codec/avcodec/avcodec.c | 7 vlc-3.0.20/modules/codec/avcodec/avcodec.h | 3 vlc-3.0.20/modules/codec/avcodec/d3d11va.c | 76 vlc-3.0.20/modules/codec/avcodec/directx_va.c | 287 vlc-3.0.20/modules/codec/avcodec/directx_va.h | 7 vlc-3.0.20/modules/codec/avcodec/dxva2.c | 37 vlc-3.0.20/modules/codec/avcodec/encoder.c | 22 vlc-3.0.20/modules/codec/avcodec/subtitle.c | 6 vlc-3.0.20/modules/codec/avcodec/va.c | 10 vlc-3.0.20/modules/codec/avcodec/va.h | 5 vlc-3.0.20/modules/codec/avcodec/va_surface.c | 16 vlc-3.0.20/modules/codec/avcodec/va_surface_internal.h | 2 vlc-3.0.20/modules/codec/avcodec/vaapi.c | 4 vlc-3.0.20/modules/codec/avcodec/video.c | 382 vlc-3.0.20/modules/codec/bpg.c | 2 vlc-3.0.20/modules/codec/cc.c | 34 vlc-3.0.20/modules/codec/cdg.c | 4 vlc-3.0.20/modules/codec/cea708.c | 12 vlc-3.0.20/modules/codec/cea708.h | 6 vlc-3.0.20/modules/codec/crystalhd.c | 4 vlc-3.0.20/modules/codec/cvdsub.c | 6 vlc-3.0.20/modules/codec/daala.c | 6 vlc-3.0.20/modules/codec/dav1d.c | 74 vlc-3.0.20/modules/codec/dmo/dmo.c | 8 vlc-3.0.20/modules/codec/dvbsub.c | 16 vlc-3.0.20/modules/codec/faad.c | 40 vlc-3.0.20/modules/codec/fdkaac.c | 22 vlc-3.0.20/modules/codec/flac.c | 18 vlc-3.0.20/modules/codec/fluidsynth.c | 6 vlc-3.0.20/modules/codec/g711.c | 6 vlc-3.0.20/modules/codec/gstreamer/gstdecode.c | 6 vlc-3.0.20/modules/codec/gstreamer/gstvlcvideopool.c | 2 vlc-3.0.20/modules/codec/jpeg.c | 203 vlc-3.0.20/modules/codec/kate.c | 20 vlc-3.0.20/modules/codec/libass.c | 81 vlc-3.0.20/modules/codec/libmpeg2.c | 24 vlc-3.0.20/modules/codec/lpcm.c | 10 vlc-3.0.20/modules/codec/mpg123.c | 18 vlc-3.0.20/modules/codec/oggspots.c | 10 vlc-3.0.20/modules/codec/omxil/OMX_Audio.h | 10 vlc-3.0.20/modules/codec/omxil/OMX_Broadcom.h | 10 vlc-3.0.20/modules/codec/omxil/OMX_Core.h | 14 vlc-3.0.20/modules/codec/omxil/OMX_Other.h | 6 vlc-3.0.20/modules/codec/omxil/OMX_Types.h | 2 vlc-3.0.20/modules/codec/omxil/OMX_Video.h | 2 vlc-3.0.20/modules/codec/omxil/mediacodec.c | 18 vlc-3.0.20/modules/codec/omxil/mediacodec.h | 8 vlc-3.0.20/modules/codec/omxil/mediacodec_jni.c | 6 vlc-3.0.20/modules/codec/omxil/mediacodec_ndk.c | 6 vlc-3.0.20/modules/codec/omxil/omxil.c | 4 vlc-3.0.20/modules/codec/omxil/omxil_utils.h | 4 vlc-3.0.20/modules/codec/omxil/utils.c | 6 vlc-3.0.20/modules/codec/opus.c | 18 vlc-3.0.20/modules/codec/png.c | 4 vlc-3.0.20/modules/codec/qsv.c | 10 vlc-3.0.20/modules/codec/rawvideo.c | 12 vlc-3.0.20/modules/codec/schroedinger.c | 26 vlc-3.0.20/modules/codec/scte18.c | 2 vlc-3.0.20/modules/codec/scte27.c | 12 vlc-3.0.20/modules/codec/sdl_image.c | 4 vlc-3.0.20/modules/codec/shine.c | 4 vlc-3.0.20/modules/codec/speex.c | 20 vlc-3.0.20/modules/codec/spudec/parse.c | 22 vlc-3.0.20/modules/codec/spudec/spudec.c | 4 vlc-3.0.20/modules/codec/spudec/spudec.h | 4 vlc-3.0.20/modules/codec/stl.c | 6 vlc-3.0.20/modules/codec/subsdec.c | 6 vlc-3.0.20/modules/codec/substext.h | 10 vlc-3.0.20/modules/codec/subsusf.c | 4 vlc-3.0.20/modules/codec/svcdsub.c | 4 vlc-3.0.20/modules/codec/svg.c | 2 vlc-3.0.20/modules/codec/synchro.c | 32 vlc-3.0.20/modules/codec/synchro.h | 6 vlc-3.0.20/modules/codec/telx.c | 4 vlc-3.0.20/modules/codec/textst.c | 4 vlc-3.0.20/modules/codec/theora.c | 10 vlc-3.0.20/modules/codec/ttml/substtml.c | 12 vlc-3.0.20/modules/codec/ttml/ttml.h | 4 vlc-3.0.20/modules/codec/twolame.c | 12 vlc-3.0.20/modules/codec/uleaddvaudio.c | 6 vlc-3.0.20/modules/codec/videotoolbox.m | 10 vlc-3.0.20/modules/codec/vorbis.c | 16 vlc-3.0.20/modules/codec/vpx.c | 4 vlc-3.0.20/modules/codec/webvtt/CSSGrammar.c | 771 vlc-3.0.20/modules/codec/webvtt/CSSGrammar.h | 11 vlc-3.0.20/modules/codec/webvtt/CSSLexer.c | 278 vlc-3.0.20/modules/codec/webvtt/subsvtt.c | 58 vlc-3.0.20/modules/codec/webvtt/webvtt.c | 6 vlc-3.0.20/modules/codec/webvtt/webvtt.h | 6 vlc-3.0.20/modules/codec/wmafixed/wma.c | 6 vlc-3.0.20/modules/codec/x264.c | 4 vlc-3.0.20/modules/codec/x265.c | 8 vlc-3.0.20/modules/codec/xwd.c | 4 vlc-3.0.20/modules/codec/zvbi.c | 8 vlc-3.0.20/modules/control/dbus/dbus.c | 142 vlc-3.0.20/modules/control/dbus/dbus_common.h | 6 vlc-3.0.20/modules/control/dbus/dbus_player.c | 5 vlc-3.0.20/modules/control/dbus/dbus_tracklist.c | 287 vlc-3.0.20/modules/control/dbus/dbus_tracklist.h | 58 vlc-3.0.20/modules/control/hotkeys.c | 4 vlc-3.0.20/modules/control/netsync.c | 26 vlc-3.0.20/modules/control/ntservice.c | 6 vlc-3.0.20/modules/control/oldrc.c | 4 vlc-3.0.20/modules/demux/adaptive/ID.cpp | 5 vlc-3.0.20/modules/demux/adaptive/ID.hpp | 1 vlc-3.0.20/modules/demux/adaptive/PlaylistManager.cpp | 77 vlc-3.0.20/modules/demux/adaptive/PlaylistManager.h | 15 vlc-3.0.20/modules/demux/adaptive/SegmentTracker.cpp | 48 vlc-3.0.20/modules/demux/adaptive/SegmentTracker.hpp | 36 vlc-3.0.20/modules/demux/adaptive/StreamFormat.cpp | 19 vlc-3.0.20/modules/demux/adaptive/Streams.cpp | 85 vlc-3.0.20/modules/demux/adaptive/Streams.hpp | 16 vlc-3.0.20/modules/demux/adaptive/Time.hpp | 42 vlc-3.0.20/modules/demux/adaptive/http/Chunk.cpp | 4 vlc-3.0.20/modules/demux/adaptive/http/Chunk.h | 6 vlc-3.0.20/modules/demux/adaptive/http/HTTPConnectionManager.cpp | 2 vlc-3.0.20/modules/demux/adaptive/logic/BufferingLogic.cpp | 52 vlc-3.0.20/modules/demux/adaptive/logic/BufferingLogic.hpp | 38 vlc-3.0.20/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp | 6 vlc-3.0.20/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp | 10 vlc-3.0.20/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp | 2 vlc-3.0.20/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp | 4 vlc-3.0.20/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp | 2 vlc-3.0.20/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h | 2 vlc-3.0.20/modules/demux/adaptive/playlist/BasePeriod.cpp | 4 vlc-3.0.20/modules/demux/adaptive/playlist/BasePeriod.h | 4 vlc-3.0.20/modules/demux/adaptive/playlist/BasePlaylist.cpp | 8 vlc-3.0.20/modules/demux/adaptive/playlist/BasePlaylist.hpp | 12 vlc-3.0.20/modules/demux/adaptive/playlist/BaseRepresentation.cpp | 14 vlc-3.0.20/modules/demux/adaptive/playlist/BaseRepresentation.h | 12 vlc-3.0.20/modules/demux/adaptive/playlist/CodecDescription.cpp | 5 vlc-3.0.20/modules/demux/adaptive/playlist/CodecDescription.hpp | 1 vlc-3.0.20/modules/demux/adaptive/playlist/Inheritables.cpp | 4 vlc-3.0.20/modules/demux/adaptive/playlist/Inheritables.hpp | 2 vlc-3.0.20/modules/demux/adaptive/playlist/Segment.cpp | 6 vlc-3.0.20/modules/demux/adaptive/playlist/Segment.h | 6 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentBase.cpp | 8 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentBase.h | 6 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentBaseType.hpp | 6 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentInformation.cpp | 6 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentInformation.hpp | 6 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentList.cpp | 10 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentList.h | 8 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentTemplate.cpp | 20 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentTemplate.h | 10 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentTimeline.cpp | 6 vlc-3.0.20/modules/demux/adaptive/playlist/SegmentTimeline.h | 6 vlc-3.0.20/modules/demux/adaptive/plumbing/CommandsQueue.cpp | 32 vlc-3.0.20/modules/demux/adaptive/plumbing/CommandsQueue.hpp | 4 vlc-3.0.20/modules/demux/adaptive/plumbing/Demuxer.cpp | 10 vlc-3.0.20/modules/demux/adaptive/plumbing/Demuxer.hpp | 8 vlc-3.0.20/modules/demux/adaptive/plumbing/FakeESOut.cpp | 55 vlc-3.0.20/modules/demux/adaptive/plumbing/FakeESOut.hpp | 14 vlc-3.0.20/modules/demux/adaptive/plumbing/SourceStream.cpp | 2 vlc-3.0.20/modules/demux/adaptive/test/SegmentTracker.cpp | 32 vlc-3.0.20/modules/demux/adaptive/test/playlist/M3U8.cpp | 145 vlc-3.0.20/modules/demux/adaptive/test/playlist/SegmentBase.cpp | 2 vlc-3.0.20/modules/demux/adaptive/test/playlist/SegmentList.cpp | 2 vlc-3.0.20/modules/demux/adaptive/test/playlist/SegmentTemplate.cpp | 4 vlc-3.0.20/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp | 94 vlc-3.0.20/modules/demux/adaptive/test/plumbing/FakeEsOut.cpp | 52 vlc-3.0.20/modules/demux/adaptive/tools/Conversions.cpp | 10 vlc-3.0.20/modules/demux/adaptive/tools/Conversions.hpp | 6 vlc-3.0.20/modules/demux/aiff.c | 6 vlc-3.0.20/modules/demux/asf/asf.c | 54 vlc-3.0.20/modules/demux/asf/asfpacket.c | 20 vlc-3.0.20/modules/demux/asf/libasf.c | 2 vlc-3.0.20/modules/demux/asf/libasf.h | 2 vlc-3.0.20/modules/demux/au.c | 16 vlc-3.0.20/modules/demux/avformat/avformat.c | 4 vlc-3.0.20/modules/demux/avformat/demux.c | 33 vlc-3.0.20/modules/demux/avformat/mux.c | 4 vlc-3.0.20/modules/demux/avi/avi.c | 430 vlc-3.0.20/modules/demux/avi/libavi.c | 9 vlc-3.0.20/modules/demux/avi/libavi.h | 13 vlc-3.0.20/modules/demux/caf.c | 14 vlc-3.0.20/modules/demux/cdg.c | 6 vlc-3.0.20/modules/demux/dash/DASHManager.cpp | 4 vlc-3.0.20/modules/demux/dash/mpd/IsoffMainParser.cpp | 2 vlc-3.0.20/modules/demux/dash/mpd/Representation.cpp | 2 vlc-3.0.20/modules/demux/dirac.c | 12 vlc-3.0.20/modules/demux/flac.c | 24 vlc-3.0.20/modules/demux/gme.c | 2 vlc-3.0.20/modules/demux/hls/HLSStreams.cpp | 18 vlc-3.0.20/modules/demux/hls/HLSStreams.hpp | 2 vlc-3.0.20/modules/demux/hls/playlist/HLSRepresentation.cpp | 26 vlc-3.0.20/modules/demux/hls/playlist/HLSRepresentation.hpp | 6 vlc-3.0.20/modules/demux/hls/playlist/Parser.cpp | 397 vlc-3.0.20/modules/demux/hls/playlist/Parser.hpp | 4 vlc-3.0.20/modules/demux/image.c | 62 vlc-3.0.20/modules/demux/mjpeg.c | 10 vlc-3.0.20/modules/demux/mkv/chapter_command.cpp | 6 vlc-3.0.20/modules/demux/mkv/chapter_command.hpp | 6 vlc-3.0.20/modules/demux/mkv/demux.cpp | 4 vlc-3.0.20/modules/demux/mkv/demux.hpp | 30 vlc-3.0.20/modules/demux/mkv/matroska_segment.cpp | 26 vlc-3.0.20/modules/demux/mkv/matroska_segment.hpp | 10 vlc-3.0.20/modules/demux/mkv/matroska_segment_parse.cpp | 28 vlc-3.0.20/modules/demux/mkv/matroska_segment_seeker.cpp | 35 vlc-3.0.20/modules/demux/mkv/matroska_segment_seeker.hpp | 26 vlc-3.0.20/modules/demux/mkv/mkv.cpp | 40 vlc-3.0.20/modules/demux/mkv/mkv.hpp | 12 vlc-3.0.20/modules/demux/mkv/stream_io_callback.cpp | 4 vlc-3.0.20/modules/demux/mkv/stream_io_callback.hpp | 4 vlc-3.0.20/modules/demux/mkv/util.cpp | 24 vlc-3.0.20/modules/demux/mkv/util.hpp | 6 vlc-3.0.20/modules/demux/mkv/virtual_segment.cpp | 22 vlc-3.0.20/modules/demux/mkv/virtual_segment.hpp | 12 vlc-3.0.20/modules/demux/mod.c | 4 vlc-3.0.20/modules/demux/moving_avg.h | 18 vlc-3.0.20/modules/demux/mp4/essetup.c | 2 vlc-3.0.20/modules/demux/mp4/fragments.c | 6 vlc-3.0.20/modules/demux/mp4/fragments.h | 2 vlc-3.0.20/modules/demux/mp4/libmp4.c | 10 vlc-3.0.20/modules/demux/mp4/mp4.c | 163 vlc-3.0.20/modules/demux/mp4/mp4.h | 6 vlc-3.0.20/modules/demux/mp4/mpeg4.h | 2 vlc-3.0.20/modules/demux/mpc.c | 4 vlc-3.0.20/modules/demux/mpeg/es.c | 42 vlc-3.0.20/modules/demux/mpeg/h26x.c | 16 vlc-3.0.20/modules/demux/mpeg/mpeg4_iod.c | 4 vlc-3.0.20/modules/demux/mpeg/mpeg4_iod.h | 4 vlc-3.0.20/modules/demux/mpeg/mpgv.c | 4 vlc-3.0.20/modules/demux/mpeg/pes.h | 30 vlc-3.0.20/modules/demux/mpeg/ps.c | 20 vlc-3.0.20/modules/demux/mpeg/ps.h | 14 vlc-3.0.20/modules/demux/mpeg/timestamps.h | 4 vlc-3.0.20/modules/demux/mpeg/ts.c | 124 vlc-3.0.20/modules/demux/mpeg/ts.h | 2 vlc-3.0.20/modules/demux/mpeg/ts_hotfixes.c | 2 vlc-3.0.20/modules/demux/mpeg/ts_psi.c | 2 vlc-3.0.20/modules/demux/mpeg/ts_psip.c | 4 vlc-3.0.20/modules/demux/mpeg/ts_scte.c | 8 vlc-3.0.20/modules/demux/mpeg/ts_si.c | 2 vlc-3.0.20/modules/demux/mpeg/ts_streams.c | 4 vlc-3.0.20/modules/demux/mpeg/ts_streams_private.h | 10 vlc-3.0.20/modules/demux/nsv.c | 12 vlc-3.0.20/modules/demux/nuv.c | 16 vlc-3.0.20/modules/demux/ogg.c | 100 vlc-3.0.20/modules/demux/ogg.h | 14 vlc-3.0.20/modules/demux/oggseek.c | 24 vlc-3.0.20/modules/demux/playlist/asx.c | 12 vlc-3.0.20/modules/demux/playlist/itml.c | 4 vlc-3.0.20/modules/demux/playlist/itml.h | 4 vlc-3.0.20/modules/demux/playlist/m3u.c | 4 vlc-3.0.20/modules/demux/playlist/podcast.c | 10 vlc-3.0.20/modules/demux/playlist/ram.c | 4 vlc-3.0.20/modules/demux/playlist/sgimb.c | 12 vlc-3.0.20/modules/demux/pva.c | 34 vlc-3.0.20/modules/demux/rawaud.c | 4 vlc-3.0.20/modules/demux/rawdv.c | 8 vlc-3.0.20/modules/demux/rawdv.h | 4 vlc-3.0.20/modules/demux/rawvid.c | 16 vlc-3.0.20/modules/demux/real.c | 108 vlc-3.0.20/modules/demux/sid.cpp | 2 vlc-3.0.20/modules/demux/smf.c | 18 vlc-3.0.20/modules/demux/smooth/SmoothManager.cpp | 6 vlc-3.0.20/modules/demux/smooth/playlist/SmoothSegment.cpp | 2 vlc-3.0.20/modules/demux/stl.c | 14 vlc-3.0.20/modules/demux/subtitle.c | 22 vlc-3.0.20/modules/demux/timestamps_filter.h | 18 vlc-3.0.20/modules/demux/tta.c | 4 vlc-3.0.20/modules/demux/ttml.c | 8 vlc-3.0.20/modules/demux/ty.c | 52 vlc-3.0.20/modules/demux/vc1.c | 14 vlc-3.0.20/modules/demux/vobsub.c | 6 vlc-3.0.20/modules/demux/voc.c | 4 vlc-3.0.20/modules/demux/wav.c | 4 vlc-3.0.20/modules/demux/webvtt.c | 26 vlc-3.0.20/modules/demux/xa.c | 4 vlc-3.0.20/modules/gui/eject.c | 2 vlc-3.0.20/modules/gui/macosx/SPMediaKeyTap.m | 7 vlc-3.0.20/modules/gui/macosx/VLCBookmarksWindowController.m | 4 vlc-3.0.20/modules/gui/macosx/VLCControlsBarCommon.m | 6 vlc-3.0.20/modules/gui/macosx/VLCCoreInteraction.h | 4 vlc-3.0.20/modules/gui/macosx/VLCCoreInteraction.m | 10 vlc-3.0.20/modules/gui/macosx/VLCFSPanelController.m | 6 vlc-3.0.20/modules/gui/macosx/VLCInputManager.m | 8 vlc-3.0.20/modules/gui/macosx/VLCMainWindow.m | 4 vlc-3.0.20/modules/gui/macosx/VLCOpenWindowController.m | 7 vlc-3.0.20/modules/gui/macosx/VLCPLModel.m | 4 vlc-3.0.20/modules/gui/macosx/VLCRemoteControlService.m | 2 vlc-3.0.20/modules/gui/macosx/VLCSimplePrefsController.m | 10 vlc-3.0.20/modules/gui/macosx/VLCStatusBarIcon.m | 8 vlc-3.0.20/modules/gui/macosx/VLCStringUtility.m | 6 vlc-3.0.20/modules/gui/macosx/VLCWrappableTextField.h | 2 vlc-3.0.20/modules/gui/macosx/prefs_widgets.m | 22 vlc-3.0.20/modules/gui/qt/adapters/chromaprint.cpp | 2 vlc-3.0.20/modules/gui/qt/components/complete_preferences.cpp | 3 vlc-3.0.20/modules/gui/qt/components/controller.cpp | 30 vlc-3.0.20/modules/gui/qt/components/controller.hpp | 4 vlc-3.0.20/modules/gui/qt/components/playlist/selector.cpp | 4 vlc-3.0.20/modules/gui/qt/components/simple_preferences.cpp | 10 vlc-3.0.20/modules/gui/qt/dialogs/bookmarks.cpp | 2 vlc-3.0.20/modules/gui/qt/dialogs/plugins.cpp | 11 vlc-3.0.20/modules/gui/qt/dialogs/plugins.hpp | 3 vlc-3.0.20/modules/gui/qt/input_manager.cpp | 6 vlc-3.0.20/modules/gui/qt/input_manager.hpp | 4 vlc-3.0.20/modules/gui/qt/util/input_slider.cpp | 4 vlc-3.0.20/modules/gui/skins2/controls/ctrl_checkbox.hpp | 4 vlc-3.0.20/modules/gui/skins2/controls/ctrl_generic.hpp | 4 vlc-3.0.20/modules/gui/skins2/controls/ctrl_slider.hpp | 6 vlc-3.0.20/modules/gui/skins2/controls/ctrl_text.hpp | 6 vlc-3.0.20/modules/gui/skins2/controls/ctrl_video.cpp | 4 vlc-3.0.20/modules/gui/skins2/os2/os2_factory.hpp | 2 vlc-3.0.20/modules/gui/skins2/os2/os2_graphics.hpp | 4 vlc-3.0.20/modules/gui/skins2/os2/os2_popup.hpp | 2 vlc-3.0.20/modules/gui/skins2/os2/os2_timer.hpp | 2 vlc-3.0.20/modules/gui/skins2/parser/interpreter.hpp | 4 vlc-3.0.20/modules/gui/skins2/src/anim_bitmap.hpp | 4 vlc-3.0.20/modules/gui/skins2/src/os_graphics.hpp | 6 vlc-3.0.20/modules/gui/skins2/src/os_popup.hpp | 4 vlc-3.0.20/modules/gui/skins2/src/var_manager.hpp | 6 vlc-3.0.20/modules/gui/skins2/src/vlcproc.cpp | 4 vlc-3.0.20/modules/gui/skins2/src/vout_manager.hpp | 4 vlc-3.0.20/modules/gui/skins2/utils/pointer.hpp | 4 vlc-3.0.20/modules/gui/skins2/utils/ustring.hpp | 4 vlc-3.0.20/modules/gui/skins2/vars/time.cpp | 8 vlc-3.0.20/modules/gui/skins2/win32/win32_factory.hpp | 4 vlc-3.0.20/modules/gui/skins2/win32/win32_graphics.hpp | 6 vlc-3.0.20/modules/gui/skins2/win32/win32_popup.hpp | 4 vlc-3.0.20/modules/gui/skins2/win32/win32_timer.hpp | 4 vlc-3.0.20/modules/gui/skins2/x11/x11_factory.hpp | 4 vlc-3.0.20/modules/gui/skins2/x11/x11_graphics.cpp | 4 vlc-3.0.20/modules/gui/skins2/x11/x11_graphics.hpp | 6 vlc-3.0.20/modules/gui/skins2/x11/x11_loop.cpp | 4 vlc-3.0.20/modules/gui/skins2/x11/x11_loop.hpp | 4 vlc-3.0.20/modules/gui/skins2/x11/x11_popup.hpp | 4 vlc-3.0.20/modules/gui/skins2/x11/x11_timer.cpp | 12 vlc-3.0.20/modules/gui/skins2/x11/x11_timer.hpp | 10 vlc-3.0.20/modules/hw/vaapi/filters.c | 14 vlc-3.0.20/modules/hw/vaapi/vlc_vaapi.h | 4 vlc-3.0.20/modules/hw/vdpau/avcodec.c | 4 vlc-3.0.20/modules/hw/vdpau/chroma.c | 2 vlc-3.0.20/modules/hw/vdpau/deinterlace.c | 8 vlc-3.0.20/modules/hw/vdpau/display.c | 4 vlc-3.0.20/modules/keystore/kwallet.c | 2 vlc-3.0.20/modules/lua/libs/input.c | 4 vlc-3.0.20/modules/lua/libs/osd.c | 4 vlc-3.0.20/modules/lua/libs/win.c | 4 vlc-3.0.20/modules/lua/vlc.c | 6 vlc-3.0.20/modules/meta_engine/taglib.cpp | 108 vlc-3.0.20/modules/misc/audioscrobbler.c | 14 vlc-3.0.20/modules/misc/inhibit/dbus.c | 17 vlc-3.0.20/modules/misc/inhibit/xdg.c | 2 vlc-3.0.20/modules/misc/playlist/html.c | 4 vlc-3.0.20/modules/misc/playlist/m3u.c | 4 vlc-3.0.20/modules/misc/playlist/xspf.c | 4 vlc-3.0.20/modules/misc/rtsp.c | 4 vlc-3.0.20/modules/misc/stats.c | 16 vlc-3.0.20/modules/mux/asf.c | 26 vlc-3.0.20/modules/mux/avi.c | 8 vlc-3.0.20/modules/mux/mp4/libmp4mux.c | 18 vlc-3.0.20/modules/mux/mp4/libmp4mux.h | 10 vlc-3.0.20/modules/mux/mp4/mp4.c | 74 vlc-3.0.20/modules/mux/mpeg/pes.c | 20 vlc-3.0.20/modules/mux/mpeg/pes.h | 4 vlc-3.0.20/modules/mux/mpeg/ps.c | 22 vlc-3.0.20/modules/mux/mpeg/tables.c | 4 vlc-3.0.20/modules/mux/mpeg/ts.c | 66 vlc-3.0.20/modules/mux/mpjpeg.c | 4 vlc-3.0.20/modules/mux/ogg.c | 40 vlc-3.0.20/modules/packetizer/a52.c | 20 vlc-3.0.20/modules/packetizer/av1.c | 61 vlc-3.0.20/modules/packetizer/av1_obu.c | 173 vlc-3.0.20/modules/packetizer/av1_obu.h | 3 vlc-3.0.20/modules/packetizer/avparser.c | 4 vlc-3.0.20/modules/packetizer/copy.c | 10 vlc-3.0.20/modules/packetizer/dirac.c | 58 vlc-3.0.20/modules/packetizer/dts.c | 12 vlc-3.0.20/modules/packetizer/flac.c | 25 vlc-3.0.20/modules/packetizer/flac.h | 6 vlc-3.0.20/modules/packetizer/h264.c | 56 vlc-3.0.20/modules/packetizer/hevc.c | 24 vlc-3.0.20/modules/packetizer/hxxx_common.c | 8 vlc-3.0.20/modules/packetizer/mlp.c | 12 vlc-3.0.20/modules/packetizer/mpeg4audio.c | 20 vlc-3.0.20/modules/packetizer/mpeg4video.c | 36 vlc-3.0.20/modules/packetizer/mpegaudio.c | 20 vlc-3.0.20/modules/packetizer/mpegvideo.c | 64 vlc-3.0.20/modules/packetizer/packetizer_helper.h | 8 vlc-3.0.20/modules/packetizer/vc1.c | 44 vlc-3.0.20/modules/services_discovery/microdns.c | 4 vlc-3.0.20/modules/services_discovery/sap.c | 16 vlc-3.0.20/modules/services_discovery/udev.c | 2 vlc-3.0.20/modules/services_discovery/upnp.cpp | 4 vlc-3.0.20/modules/spu/audiobargraph_v.c | 6 vlc-3.0.20/modules/spu/dynamicoverlay/dynamicoverlay.c | 6 vlc-3.0.20/modules/spu/logo.c | 16 vlc-3.0.20/modules/spu/marq.c | 10 vlc-3.0.20/modules/spu/mosaic.c | 8 vlc-3.0.20/modules/spu/remoteosd.c | 8 vlc-3.0.20/modules/spu/rss.c | 16 vlc-3.0.20/modules/spu/subsdelay.c | 26 vlc-3.0.20/modules/stream_filter/cache_block.c | 8 vlc-3.0.20/modules/stream_filter/cache_read.c | 12 vlc-3.0.20/modules/stream_filter/hds/hds.c | 8 vlc-3.0.20/modules/stream_filter/prefetch.c | 1 vlc-3.0.20/modules/stream_filter/record.c | 4 vlc-3.0.20/modules/stream_out/autodel.c | 8 vlc-3.0.20/modules/stream_out/bridge.c | 22 vlc-3.0.20/modules/stream_out/chromecast/cast.cpp | 4 vlc-3.0.20/modules/stream_out/chromecast/chromecast.h | 18 vlc-3.0.20/modules/stream_out/chromecast/chromecast_common.h | 2 vlc-3.0.20/modules/stream_out/chromecast/chromecast_ctrl.cpp | 46 vlc-3.0.20/modules/stream_out/chromecast/chromecast_demux.cpp | 26 vlc-3.0.20/modules/stream_out/cycle.c | 18 vlc-3.0.20/modules/stream_out/delay.c | 8 vlc-3.0.20/modules/stream_out/description.c | 4 vlc-3.0.20/modules/stream_out/display.c | 6 vlc-3.0.20/modules/stream_out/record.c | 20 vlc-3.0.20/modules/stream_out/rtp.c | 14 vlc-3.0.20/modules/stream_out/rtpfmt.c | 28 vlc-3.0.20/modules/stream_out/rtsp.c | 8 vlc-3.0.20/modules/stream_out/smem.c | 20 vlc-3.0.20/modules/stream_out/stats.c | 8 vlc-3.0.20/modules/stream_out/transcode/audio.c | 12 vlc-3.0.20/modules/stream_out/transcode/transcode.h | 2 vlc-3.0.20/modules/stream_out/vod.c | 4 vlc-3.0.20/modules/text_renderer/freetype/fonts/fontconfig.c | 4 vlc-3.0.20/modules/text_renderer/freetype/freetype.c | 6 vlc-3.0.20/modules/video_chroma/chain.c | 4 vlc-3.0.20/modules/video_chroma/d3d11_fmt.c | 151 vlc-3.0.20/modules/video_chroma/d3d11_fmt.h | 29 vlc-3.0.20/modules/video_chroma/d3d9_fmt.c | 123 vlc-3.0.20/modules/video_chroma/d3d9_fmt.h | 40 vlc-3.0.20/modules/video_chroma/i420_rgb16.c | 6 vlc-3.0.20/modules/video_filter/Makefile.am | 5 vlc-3.0.20/modules/video_filter/antiflicker.c | 2 vlc-3.0.20/modules/video_filter/ball.c | 4 vlc-3.0.20/modules/video_filter/blendbench.c | 4 vlc-3.0.20/modules/video_filter/canvas.c | 4 vlc-3.0.20/modules/video_filter/croppadd.c | 4 vlc-3.0.20/modules/video_filter/deinterlace/algo_ivtc.c | 8 vlc-3.0.20/modules/video_filter/deinterlace/algo_ivtc.h | 6 vlc-3.0.20/modules/video_filter/deinterlace/algo_x.c | 4 vlc-3.0.20/modules/video_filter/deinterlace/common.c | 20 vlc-3.0.20/modules/video_filter/deinterlace/common.h | 6 vlc-3.0.20/modules/video_filter/fps.c | 10 vlc-3.0.20/modules/video_filter/freeze.c | 6 vlc-3.0.20/modules/video_filter/grain.c | 6 vlc-3.0.20/modules/video_filter/motiondetect.c | 8 vlc-3.0.20/modules/video_filter/oldmovie.c | 28 vlc-3.0.20/modules/video_filter/ripple.c | 8 vlc-3.0.20/modules/video_filter/vhs.c | 18 vlc-3.0.20/modules/video_filter/wave.c | 8 vlc-3.0.20/modules/video_output/Makefile.am | 27 vlc-3.0.20/modules/video_output/android/display.c | 2 vlc-3.0.20/modules/video_output/android/display.h | 4 vlc-3.0.20/modules/video_output/caca.c | 4 vlc-3.0.20/modules/video_output/caopengllayer.m | 6 vlc-3.0.20/modules/video_output/decklink.cpp | 6 vlc-3.0.20/modules/video_output/macosx.m | 4 vlc-3.0.20/modules/video_output/opengl/interop_dxva2.c | 543 vlc-3.0.20/modules/video_output/opengl/vout_helper.h | 5 vlc-3.0.20/modules/video_output/vdummy.c | 8 vlc-3.0.20/modules/video_output/win32/common.c | 39 vlc-3.0.20/modules/video_output/win32/common.h | 5 vlc-3.0.20/modules/video_output/win32/d3d11_quad.c | 2 vlc-3.0.20/modules/video_output/win32/d3d11_scaler.cpp | 459 vlc-3.0.20/modules/video_output/win32/d3d11_scaler.h | 37 vlc-3.0.20/modules/video_output/win32/direct3d11.c | 484 vlc-3.0.20/modules/video_output/win32/direct3d9.c | 429 vlc-3.0.20/modules/video_output/win32/events.c | 12 vlc-3.0.20/modules/visualization/cyclic_buffer.h | 4 vlc-3.0.20/modules/visualization/glspectrum.c | 2 vlc-3.0.20/modules/visualization/goom.c | 41 vlc-3.0.20/modules/visualization/projectm.cpp | 6 vlc-3.0.20/modules/visualization/visual/effects.c | 4 vlc-3.0.20/modules/visualization/vsxu.cpp | 4 vlc-3.0.20/po/LINGUAS | 8 vlc-3.0.20/po/ach.po | 2536 vlc-3.0.20/po/af.po | 3441 - vlc-3.0.20/po/am.po | 3360 - vlc-3.0.20/po/am_ET.po | 1421 vlc-3.0.20/po/an.po | 5467 - vlc-3.0.20/po/ar.po | 9702 --- vlc-3.0.20/po/as_IN.po | 2979 - vlc-3.0.20/po/ast.po | 5590 - vlc-3.0.20/po/be.po | 7718 -- vlc-3.0.20/po/bg.po | 6979 -- vlc-3.0.20/po/bn.po | 6807 -- vlc-3.0.20/po/bn_IN.po | 5734 -- vlc-3.0.20/po/br.po | 3532 - vlc-3.0.20/po/brx.po | 2995 - vlc-3.0.20/po/bs.po | 2033 vlc-3.0.20/po/ca.po |14032 ---- vlc-3.0.20/po/ca@valencia.po | 3629 - vlc-3.0.20/po/cgg.po | 2923 - vlc-3.0.20/po/co.po | 4690 - vlc-3.0.20/po/cs.po | 6577 +- vlc-3.0.20/po/cy.po | 3012 - vlc-3.0.20/po/da.po |12939 ---- vlc-3.0.20/po/de.po | 3505 - vlc-3.0.20/po/el.po |12710 ---- vlc-3.0.20/po/en_GB.po | 6662 -- vlc-3.0.20/po/eo.po |28160 +++++++++ vlc-3.0.20/po/es.po |15304 ----- vlc-3.0.20/po/es_MX.po | 3797 - vlc-3.0.20/po/et.po | 8742 --- vlc-3.0.20/po/eu.po |11057 --- vlc-3.0.20/po/fa.po | 5909 -- vlc-3.0.20/po/ff.po | 2448 vlc-3.0.20/po/fi.po |10142 --- vlc-3.0.20/po/fr.po |10964 --- vlc-3.0.20/po/fur.po |11734 +--- vlc-3.0.20/po/fy.po | 3254 - vlc-3.0.20/po/ga.po | 3310 - vlc-3.0.20/po/gd.po | 2968 - vlc-3.0.20/po/gl.po | 8997 --- vlc-3.0.20/po/gu.po | 3185 - vlc-3.0.20/po/he.po | 6726 -- vlc-3.0.20/po/hi.po | 3312 - vlc-3.0.20/po/hr.po |10318 --- vlc-3.0.20/po/hu.po | 9859 --- vlc-3.0.20/po/hy.po | 8880 --- vlc-3.0.20/po/id.po | 7406 -- vlc-3.0.20/po/ie.po |28167 +++++++++ vlc-3.0.20/po/is.po | 3752 - vlc-3.0.20/po/it.po |15568 ----- vlc-3.0.20/po/ja.po | 9172 --- vlc-3.0.20/po/ka.po | 9016 --- vlc-3.0.20/po/kab.po | 3884 - vlc-3.0.20/po/kk.po | 5631 - vlc-3.0.20/po/km.po | 8346 -- vlc-3.0.20/po/kn.po | 3594 - vlc-3.0.20/po/ko.po |15620 ----- vlc-3.0.20/po/ks_IN.po | 3047 - vlc-3.0.20/po/ku_IQ.po | 1296 vlc-3.0.20/po/ky.po | 1399 vlc-3.0.20/po/lg.po | 3233 - vlc-3.0.20/po/lo.po |28164 +++++++++ vlc-3.0.20/po/lt.po | 6914 -- vlc-3.0.20/po/lv.po | 4922 - vlc-3.0.20/po/mai.po | 3000 - vlc-3.0.20/po/mk.po |28142 +++++++++ vlc-3.0.20/po/ml.po | 3563 - vlc-3.0.20/po/mn.po | 3199 - vlc-3.0.20/po/mr.po | 3761 - vlc-3.0.20/po/ms.po |13464 ---- vlc-3.0.20/po/my.po |28205 +++++++++ vlc-3.0.20/po/nb.po |10071 --- vlc-3.0.20/po/ne.po | 8696 --- vlc-3.0.20/po/nl.po | 2019 vlc-3.0.20/po/nn.po | 9695 --- vlc-3.0.20/po/oc.po | 6216 -- vlc-3.0.20/po/or_IN.po |28148 +++++++++ vlc-3.0.20/po/pa.po | 5954 -- vlc-3.0.20/po/pl.po |10935 --- vlc-3.0.20/po/ps.po | 2741 vlc-3.0.20/po/pt_BR.po | 9671 --- vlc-3.0.20/po/pt_PT.po | 9187 --- vlc-3.0.20/po/ro.po |10460 --- vlc-3.0.20/po/ru.po | 9148 --- vlc-3.0.20/po/si.po | 4029 - vlc-3.0.20/po/sk.po | 9339 --- vlc-3.0.20/po/sl.po |12120 ---- vlc-3.0.20/po/sm.po |28149 +++++++++ vlc-3.0.20/po/sq.po | 1908 vlc-3.0.20/po/sr.po | 8379 -- vlc-3.0.20/po/sv.po |10840 --- vlc-3.0.20/po/sw.po |28419 ++++++++++ vlc-3.0.20/po/ta.po | 2317 vlc-3.0.20/po/te.po | 2393 vlc-3.0.20/po/th.po | 3892 - vlc-3.0.20/po/tr.po | 6899 +- vlc-3.0.20/po/tt.po | 1987 vlc-3.0.20/po/ug.po | 1090 vlc-3.0.20/po/uk.po | 3476 - vlc-3.0.20/po/uz.po | 1387 vlc-3.0.20/po/vi.po | 6017 -- vlc-3.0.20/po/vlc.pot | 966 vlc-3.0.20/po/wa.po | 6524 -- vlc-3.0.20/po/zh_CN.po |10916 --- vlc-3.0.20/po/zh_TW.po | 8158 -- vlc-3.0.20/po/zu.po | 3228 - vlc-3.0.20/share/lua/http/css/mobile.css | 28 vlc-3.0.20/share/lua/http/js/controllers.js | 3 vlc-3.0.20/share/lua/http/mobile.html | 4 vlc-3.0.20/share/lua/intf/modules/httprequests.lua | 1 vlc-3.0.20/share/lua/playlist/youtube.lua | 6 vlc-3.0.20/src/Makefile.am | 3 vlc-3.0.20/src/Makefile.in | 4 vlc-3.0.20/src/android/thread.c | 2 vlc-3.0.20/src/audio_output/aout_internal.h | 10 vlc-3.0.20/src/audio_output/dec.c | 24 vlc-3.0.20/src/audio_output/output.c | 8 vlc-3.0.20/src/darwin/dirs.c | 1 vlc-3.0.20/src/darwin/thread.c | 12 vlc-3.0.20/src/input/clock.c | 132 vlc-3.0.20/src/input/clock.h | 22 vlc-3.0.20/src/input/control.c | 8 vlc-3.0.20/src/input/decoder.c | 74 vlc-3.0.20/src/input/decoder.h | 8 vlc-3.0.20/src/input/demux_chained.c | 2 vlc-3.0.20/src/input/es_out.c | 254 vlc-3.0.20/src/input/es_out.h | 26 vlc-3.0.20/src/input/es_out_timeshift.c | 54 vlc-3.0.20/src/input/event.c | 10 vlc-3.0.20/src/input/event.h | 10 vlc-3.0.20/src/input/input.c | 59 vlc-3.0.20/src/input/input_internal.h | 3 vlc-3.0.20/src/input/item.c | 10 vlc-3.0.20/src/input/stats.c | 4 vlc-3.0.20/src/input/vlm.c | 4 vlc-3.0.20/src/libvlc.h | 6 vlc-3.0.20/src/linux/thread.c | 2 vlc-3.0.20/src/misc/background_worker.c | 14 vlc-3.0.20/src/misc/background_worker.h | 2 vlc-3.0.20/src/misc/block.c | 2 vlc-3.0.20/src/misc/fifo.c | 2 vlc-3.0.20/src/misc/filter_chain.c | 2 vlc-3.0.20/src/misc/interrupt.c | 2 vlc-3.0.20/src/misc/mtime.c | 16 vlc-3.0.20/src/misc/picture.c | 4 vlc-3.0.20/src/misc/picture_fifo.c | 6 vlc-3.0.20/src/misc/subpicture.c | 4 vlc-3.0.20/src/misc/text_style.c | 6 vlc-3.0.20/src/misc/threads.c | 10 vlc-3.0.20/src/missing.c | 4 vlc-3.0.20/src/modules/bank.c | 75 vlc-3.0.20/src/network/httpd.c | 6 vlc-3.0.20/src/network/tcp.c | 8 vlc-3.0.20/src/network/tls.c | 6 vlc-3.0.20/src/os2/thread.c | 16 vlc-3.0.20/src/playlist/item.c | 6 vlc-3.0.20/src/playlist/playlist_internal.h | 4 vlc-3.0.20/src/playlist/sort.c | 6 vlc-3.0.20/src/playlist/thread.c | 6 vlc-3.0.20/src/posix/thread.c | 10 vlc-3.0.20/src/posix/timer.c | 8 vlc-3.0.20/src/revision.c | 2 vlc-3.0.20/src/revision.txt | 2 vlc-3.0.20/src/stream_output/sap.c | 4 vlc-3.0.20/src/stream_output/stream_output.c | 10 vlc-3.0.20/src/test/timer.c | 2 vlc-3.0.20/src/video_output/chrono.h | 26 vlc-3.0.20/src/video_output/control.c | 8 vlc-3.0.20/src/video_output/control.h | 12 vlc-3.0.20/src/video_output/display.c | 26 vlc-3.0.20/src/video_output/display.h | 6 vlc-3.0.20/src/video_output/snapshot.c | 6 vlc-3.0.20/src/video_output/snapshot.h | 4 vlc-3.0.20/src/video_output/video_epg.c | 6 vlc-3.0.20/src/video_output/video_output.c | 90 vlc-3.0.20/src/video_output/video_text.c | 8 vlc-3.0.20/src/video_output/video_widgets.c | 6 vlc-3.0.20/src/video_output/vout_control.h | 10 vlc-3.0.20/src/video_output/vout_internal.h | 16 vlc-3.0.20/src/video_output/vout_subpictures.c | 38 vlc-3.0.20/src/video_output/vout_wrapper.c | 6 vlc-3.0.20/src/win32/thread.c | 24 vlc-3.0.20/src/win32/timer.c | 2 vlc-3.0.20/test/Makefile.am | 11 vlc-3.0.20/test/Makefile.in | 91 vlc-3.0.20/test/iosvlc.m | 167 vlc-3.0.20/test/src/input/demux-run.c | 4 vlc-3.0.20/test/src/interface/dialog.c | 2 956 files changed, 320710 insertions(+), 541537 deletions(-) diff -Nru vlc-3.0.18/NEWS vlc-3.0.20/NEWS --- vlc-3.0.18/NEWS 2022-10-13 18:40:37.000000000 +0000 +++ vlc-3.0.20/NEWS 2023-10-30 07:41:34.000000000 +0000 @@ -1,15 +1,98 @@ +Changes between 3.0.19 and 3.0.20: +---------------------------------- + +Video Output: + - Fix green line in fullscreen in D3D11 video output + - Fix crash with some AMD drivers old versions + - Fix events propagation issue when double-clicking with mouse wheel + +Decoders: + - Fix crash when AV1 hardware decoder fails + +Interface: + - Fix annoying disappearance of the Windows fullscreen controller + +Demuxers: + - Fix potential security issue (OOB Write) on MMS:// by checking user size bounds + + +Changes between 3.0.18 and 3.0.19: +---------------------------------- + +Core: + * Fix next-frame freezing in most scenarios + +Demux: + * Fix FLAC playback quality regression with variable frame size + * Support RIFF INFO tags for Wav files + * Fix AVI files with flipped RAW video planes + * Fix duration on short and small Ogg/Opus files + * Fix some HLS/TS streams with ID3 prefix + * Fix some HLS playlist refresh drift + * Fix for GoPro MAX spatial metadata + * Improve FFmpeg-muxed MP4 chapters handling + * Improve playback for QNap-produced AVI files + * Improve playback of some old RealVideo files + * Fix duration probing on some MP4 with missing information + +Decoders: + * Multiple fixes on AAC handling + * Activate hardware decoding of AV1 on Windows (DxVA) + * Improve AV1 HDR support with software decoding + * Fix some AV1 GBRP streams, AV1 super-resolution streams and monochrome ones + * Fix black screen on poorly edited MP4 files on Android Mediacodec + * Fix rawvid video in NV12 + * Fix several issues on Windows hardware decoding (including "too large resolution in DxVA") + * Improve crunchyroll-produced SSA rendering + +Video Output: + * Super Resolution scaling with nVidia and Intel GPUs + * Fix for an issue when cropping on Direct3D9 + * Multiple fixes for hardware decoding on D3D11 and OpenGL interop + * Fix an issue when playing -90°rotated video + * Fix subtitles rendering blur on recent macOS + +Input: + * Improve SMB compatibility with Windows 11 hosts + +Contribs: + * Update of fluidlite, fixing some MIDI rendering on Windows + * Update of zlib to 1.2.13 (CVE-2022-37434) + * Update of FFmpeg, vpx (CVE-2023-5217), ebml, dav1d, libass + +Misc: + * Improve muxing timestamps in a few formats (reset to 0) + * Fix some rendering issues on Linux with the fullscreen controller + * Fix GOOM visualization + * Fixes for Youtube playback + * Fix some MPRIS inconsistencies that broke some OS widgets on Linux + * Implement MPRIS TrackList signals + * Fix opening files in read-only mode + * Fix password search using the Kwallet backend + * Fix some crashes on macOS when switching application + * Fix 5.1/7.1 output on macOS and tvOS + * Fix several crashes and bugs in the macOS preferences panel + * Improvements on the threading of the MMDevice audio output on Windows + * Fix a potential security issue on the uninstaller DLLs (CVE-2023-46814) + * Fix memory leaks when using the media_list_player libVLC APIs + +Translations: + * Update of most translations + * New translations to Esperanto, Interlingue, Lao, Macedonian, Burmese, Odia, Samoan and Swahili + + Changes between 3.0.18-rc2 and 3.0.18: -------------------------------------- macOS: -* Fix audio device listing with non-latin names -* Update some translations + * Fix audio device listing with non-latin names + * Update some translations Misc: -* Fix rendering and performance issue with older GPUs + * Fix rendering and performance issue with older GPUs Contribs: -* Update aom + * Update aom Changes between 3.0.18-rc and 3.0.18-rc2: diff -Nru vlc-3.0.18/aclocal.m4 vlc-3.0.20/aclocal.m4 --- vlc-3.0.18/aclocal.m4 2022-10-13 18:40:51.000000000 +0000 +++ vlc-3.0.20/aclocal.m4 2023-10-30 07:26:11.000000000 +0000 @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- # serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant . @@ -108,7 +108,7 @@ dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -177,14 +177,14 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -196,7 +196,7 @@ ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -206,10 +206,10 @@ To get pkg-config, see .])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES @@ -296,6 +296,74 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru vlc-3.0.18/configure vlc-3.0.20/configure --- vlc-3.0.18/configure 2022-10-13 18:40:59.000000000 +0000 +++ vlc-3.0.20/configure 2023-10-30 07:26:12.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for vlc 3.0.18. +# Generated by GNU Autoconf 2.71 for vlc 3.0.20. # -# Copyright 1999-2022 VLC authors and VideoLAN +# Copyright 1999-2023 VLC authors and VideoLAN # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -620,8 +620,8 @@ # Identity of this package. PACKAGE_NAME='vlc' PACKAGE_TARNAME='vlc' -PACKAGE_VERSION='3.0.18' -PACKAGE_STRING='vlc 3.0.18' +PACKAGE_VERSION='3.0.20' +PACKAGE_STRING='vlc 3.0.20' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -2712,7 +2712,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vlc 3.0.18 to adapt to many kinds of systems. +\`configure' configures vlc 3.0.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2787,7 +2787,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vlc 3.0.18:";; + short | recursive ) echo "Configuration of vlc 3.0.20:";; esac cat <<\_ACEOF @@ -3551,14 +3551,14 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vlc configure 3.0.18 +vlc configure 3.0.20 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright 1999-2022 VLC authors and VideoLAN +Copyright 1999-2023 VLC authors and VideoLAN _ACEOF exit fi @@ -4214,7 +4214,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vlc $as_me 3.0.18, which was +It was created by vlc $as_me 3.0.20, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -5190,7 +5190,7 @@ VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=18 +VERSION_REVISION=20 VERSION_EXTRA=0 VERSION_DEV= @@ -5199,7 +5199,7 @@ CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Vetinari" -COPYRIGHT_YEARS="1996-2022" +COPYRIGHT_YEARS="1996-2023" @@ -5798,7 +5798,7 @@ # Define the identity of the package. PACKAGE='vlc' - VERSION='3.0.18' + VERSION='3.0.20' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7862,11 +7862,11 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7908,11 +7908,11 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9099,68 +9099,7 @@ else $as_nop LEXLIB=$ac_cv_lib_lex fi - ac_save_LIBS="$LIBS" - LIBS= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing yywrap" >&5 -printf %s "checking for library containing yywrap... " >&6; } -if test ${ac_cv_search_yywrap+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char yywrap (); -int -main (void) -{ -return yywrap (); - ; - return 0; -} -_ACEOF -for ac_lib in '' fl l -do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO" -then : - ac_cv_search_yywrap=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext - if test ${ac_cv_search_yywrap+y} -then : - break -fi -done -if test ${ac_cv_search_yywrap+y} -then : - -else $as_nop - ac_cv_search_yywrap=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yywrap" >&5 -printf "%s\n" "$ac_cv_search_yywrap" >&6; } -ac_res=$ac_cv_search_yywrap -if test "$ac_res" != no -then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LEXLIB="$LIBS" -fi - LIBS="$ac_save_LIBS" fi @@ -28266,12 +28205,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MINIZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "minizip " 2>&1` + MINIZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "minizip " 2>&1` else - MINIZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "minizip " 2>&1` + MINIZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "minizip " 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MINIZIP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MINIZIP_PKG_ERRORS" >&5 for ac_header in unzip.h @@ -28315,11 +28254,11 @@ done else - MINIZIP_CFLAGS=$pkg_cv_MINIZIP_CFLAGS - MINIZIP_LIBS=$pkg_cv_MINIZIP_LIBS + MINIZIP_CFLAGS=$pkg_cv_MINIZIP_CFLAGS + MINIZIP_LIBS=$pkg_cv_MINIZIP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_minizip=yes + have_minizip=yes fi fi if test "${have_minizip}" = "yes" ; then @@ -28384,12 +28323,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - IDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn" 2>&1` + IDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn" 2>&1` else - IDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn" 2>&1` + IDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$IDN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$IDN_PKG_ERRORS" >&5 have_libidn="no" @@ -28401,8 +28340,8 @@ have_libidn="no" else - IDN_CFLAGS=$pkg_cv_IDN_CFLAGS - IDN_LIBS=$pkg_cv_IDN_LIBS + IDN_CFLAGS=$pkg_cv_IDN_CFLAGS + IDN_LIBS=$pkg_cv_IDN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -28476,12 +28415,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.6.0" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.6.0" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.6.0" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.6.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 if test -n "${enable_dbus}" @@ -28513,8 +28452,8 @@ fi else - DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS - DBUS_LIBS=$pkg_cv_DBUS_LIBS + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -28585,12 +28524,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SYSTEMD_PKG_ERRORS}." >&5 @@ -28604,8 +28543,8 @@ printf "%s\n" "$as_me: WARNING: ${SYSTEMD_PKG_ERRORS}." >&2;} else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS + SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -31674,6 +31613,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -31687,9 +31627,10 @@ ac_cv_altivec_inline="yes" else $as_nop CFLAGS="${CFLAGS} -Wa,-maltivec" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -31971,12 +31912,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.2" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.2" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.2" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&5 @@ -32034,12 +31975,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 @@ -32096,12 +32037,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 @@ -32497,11 +32438,11 @@ else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi elif test $pkg_failed = untried; then @@ -32562,12 +32503,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 @@ -32963,19 +32904,19 @@ else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi elif test $pkg_failed = untried; then @@ -33037,12 +32978,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 @@ -33099,12 +33040,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 @@ -33500,11 +33441,11 @@ else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi elif test $pkg_failed = untried; then @@ -33565,12 +33506,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 @@ -33966,27 +33907,27 @@ else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_lua=yes + have_lua=yes fi if test "x${have_lua}" != "xyes" ; then as_fn_error $? "Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error." "$LINENO" 5 @@ -34258,14 +34199,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` + ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` else - ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` + ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ARCHIVE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ARCHIVE_PKG_ERRORS" >&5 - if test x"$enable_archive" = "xyes" + if test x"$enable_archive" = "xyes" then : as_fn_error $? "Library libarchive >= 3.1.0 needed for archive was not found" "$LINENO" 5 else $as_nop @@ -34276,7 +34217,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_archive" = "xyes" + if test x"$enable_archive" = "xyes" then : as_fn_error $? "Library libarchive >= 3.1.0 needed for archive was not found" "$LINENO" 5 else $as_nop @@ -34285,11 +34226,11 @@ fi else - ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS - ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS + ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS + ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBarchive=libarchive_plugin.la + LTLIBarchive=libarchive_plugin.la @@ -34360,14 +34301,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` + ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` else - ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` + ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libarchive >= 3.1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ARCHIVE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ARCHIVE_PKG_ERRORS" >&5 - enable_archive=no + enable_archive=no if test x"$enable_archive" = "xyes" then : as_fn_error $? "Library libarchive >= 3.1.0 needed for archive was not found" "$LINENO" 5 @@ -34379,7 +34320,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_archive=no + enable_archive=no if test x"$enable_archive" = "xyes" then : as_fn_error $? "Library libarchive >= 3.1.0 needed for archive was not found" "$LINENO" 5 @@ -34389,11 +34330,11 @@ fi else - ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS - ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS + ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS + ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_archive=yes + enable_archive=yes LTLIBarchive=libarchive_plugin.la @@ -34492,12 +34433,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIVE555_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "live555" 2>&1` + LIVE555_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "live555" 2>&1` else - LIVE555_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "live555" 2>&1` + LIVE555_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "live555" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIVE555_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIVE555_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIVE555_PKG_ERRORS}." >&5 @@ -35011,8 +34952,8 @@ else - LIVE555_CFLAGS=$pkg_cv_LIVE555_CFLAGS - LIVE555_LIBS=$pkg_cv_LIVE555_LIBS + LIVE555_CFLAGS=$pkg_cv_LIVE555_CFLAGS + LIVE555_LIBS=$pkg_cv_LIVE555_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -35118,14 +35059,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` + DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` else - DC1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` + DC1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DC1394_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DC1394_PKG_ERRORS" >&5 - if test x"$enable_dc1394" = "xyes" + if test x"$enable_dc1394" = "xyes" then : as_fn_error $? "Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5 else $as_nop @@ -35136,7 +35077,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_dc1394" = "xyes" + if test x"$enable_dc1394" = "xyes" then : as_fn_error $? "Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5 else $as_nop @@ -35145,11 +35086,11 @@ fi else - DC1394_CFLAGS=$pkg_cv_DC1394_CFLAGS - DC1394_LIBS=$pkg_cv_DC1394_LIBS + DC1394_CFLAGS=$pkg_cv_DC1394_CFLAGS + DC1394_LIBS=$pkg_cv_DC1394_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdc1394=libdc1394_plugin.la + LTLIBdc1394=libdc1394_plugin.la @@ -35220,14 +35161,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` + DC1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` else - DC1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` + DC1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdc1394-2 >= 2.1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DC1394_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DC1394_PKG_ERRORS" >&5 - enable_dc1394=no + enable_dc1394=no if test x"$enable_dc1394" = "xyes" then : as_fn_error $? "Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5 @@ -35239,7 +35180,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dc1394=no + enable_dc1394=no if test x"$enable_dc1394" = "xyes" then : as_fn_error $? "Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" "$LINENO" 5 @@ -35249,11 +35190,11 @@ fi else - DC1394_CFLAGS=$pkg_cv_DC1394_CFLAGS - DC1394_LIBS=$pkg_cv_DC1394_LIBS + DC1394_CFLAGS=$pkg_cv_DC1394_CFLAGS + DC1394_LIBS=$pkg_cv_DC1394_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dc1394=yes + enable_dc1394=yes LTLIBdc1394=libdc1394_plugin.la @@ -35367,14 +35308,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DV1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` + DV1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` else - DV1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` + DV1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DV1394_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DV1394_PKG_ERRORS" >&5 - if test x"$enable_dv1394" = "xyes" + if test x"$enable_dv1394" = "xyes" then : as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" "$LINENO" 5 else $as_nop @@ -35385,7 +35326,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_dv1394" = "xyes" + if test x"$enable_dv1394" = "xyes" then : as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" "$LINENO" 5 else $as_nop @@ -35394,11 +35335,11 @@ fi else - DV1394_CFLAGS=$pkg_cv_DV1394_CFLAGS - DV1394_LIBS=$pkg_cv_DV1394_LIBS + DV1394_CFLAGS=$pkg_cv_DV1394_CFLAGS + DV1394_LIBS=$pkg_cv_DV1394_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdv1394=libdv1394_plugin.la + LTLIBdv1394=libdv1394_plugin.la @@ -35469,14 +35410,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DV1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` + DV1394_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` else - DV1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` + DV1394_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DV1394_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DV1394_PKG_ERRORS" >&5 - enable_dv1394=no + enable_dv1394=no if test x"$enable_dv1394" = "xyes" then : as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" "$LINENO" 5 @@ -35488,7 +35429,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dv1394=no + enable_dv1394=no if test x"$enable_dv1394" = "xyes" then : as_fn_error $? "Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" "$LINENO" 5 @@ -35498,11 +35439,11 @@ fi else - DV1394_CFLAGS=$pkg_cv_DV1394_CFLAGS - DV1394_LIBS=$pkg_cv_DV1394_LIBS + DV1394_CFLAGS=$pkg_cv_DV1394_CFLAGS + DV1394_LIBS=$pkg_cv_DV1394_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dv1394=yes + enable_dv1394=yes LTLIBdv1394=libdv1394_plugin.la @@ -35605,12 +35546,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LINSYS_SDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` + LINSYS_SDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` else - LINSYS_SDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` + LINSYS_SDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LINSYS_SDI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LINSYS_SDI_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&5 @@ -35624,8 +35565,8 @@ printf "%s\n" "$as_me: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&2;} else - LINSYS_SDI_CFLAGS=$pkg_cv_LINSYS_SDI_CFLAGS - LINSYS_SDI_LIBS=$pkg_cv_LINSYS_SDI_LIBS + LINSYS_SDI_CFLAGS=$pkg_cv_LINSYS_SDI_CFLAGS + LINSYS_SDI_LIBS=$pkg_cv_LINSYS_SDI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -35719,14 +35660,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DVDREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` + DVDREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` else - DVDREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` + DVDREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DVDREAD_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DVDREAD_PKG_ERRORS" >&5 - if test x"$enable_dvdread" = "xyes" + if test x"$enable_dvdread" = "xyes" then : as_fn_error $? "Library dvdread > 4.9.0 needed for dvdread was not found" "$LINENO" 5 else $as_nop @@ -35737,7 +35678,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_dvdread" = "xyes" + if test x"$enable_dvdread" = "xyes" then : as_fn_error $? "Library dvdread > 4.9.0 needed for dvdread was not found" "$LINENO" 5 else $as_nop @@ -35746,11 +35687,11 @@ fi else - DVDREAD_CFLAGS=$pkg_cv_DVDREAD_CFLAGS - DVDREAD_LIBS=$pkg_cv_DVDREAD_LIBS + DVDREAD_CFLAGS=$pkg_cv_DVDREAD_CFLAGS + DVDREAD_LIBS=$pkg_cv_DVDREAD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdvdread=libdvdread_plugin.la + LTLIBdvdread=libdvdread_plugin.la @@ -35821,14 +35762,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DVDREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` + DVDREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` else - DVDREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` + DVDREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdread > 4.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DVDREAD_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DVDREAD_PKG_ERRORS" >&5 - enable_dvdread=no + enable_dvdread=no if test x"$enable_dvdread" = "xyes" then : as_fn_error $? "Library dvdread > 4.9.0 needed for dvdread was not found" "$LINENO" 5 @@ -35840,7 +35781,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dvdread=no + enable_dvdread=no if test x"$enable_dvdread" = "xyes" then : as_fn_error $? "Library dvdread > 4.9.0 needed for dvdread was not found" "$LINENO" 5 @@ -35850,11 +35791,11 @@ fi else - DVDREAD_CFLAGS=$pkg_cv_DVDREAD_CFLAGS - DVDREAD_LIBS=$pkg_cv_DVDREAD_LIBS + DVDREAD_CFLAGS=$pkg_cv_DVDREAD_CFLAGS + DVDREAD_LIBS=$pkg_cv_DVDREAD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dvdread=yes + enable_dvdread=yes LTLIBdvdread=libdvdread_plugin.la @@ -35969,14 +35910,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DVDNAV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` + DVDNAV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` else - DVDNAV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` + DVDNAV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DVDNAV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DVDNAV_PKG_ERRORS" >&5 - if test x"$enable_dvdnav" = "xyes" + if test x"$enable_dvdnav" = "xyes" then : as_fn_error $? "Library dvdnav > 4.9.0 needed for dvdnav was not found" "$LINENO" 5 else $as_nop @@ -35987,7 +35928,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_dvdnav" = "xyes" + if test x"$enable_dvdnav" = "xyes" then : as_fn_error $? "Library dvdnav > 4.9.0 needed for dvdnav was not found" "$LINENO" 5 else $as_nop @@ -35996,11 +35937,11 @@ fi else - DVDNAV_CFLAGS=$pkg_cv_DVDNAV_CFLAGS - DVDNAV_LIBS=$pkg_cv_DVDNAV_LIBS + DVDNAV_CFLAGS=$pkg_cv_DVDNAV_CFLAGS + DVDNAV_LIBS=$pkg_cv_DVDNAV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdvdnav=libdvdnav_plugin.la + LTLIBdvdnav=libdvdnav_plugin.la @@ -36071,14 +36012,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DVDNAV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` + DVDNAV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` else - DVDNAV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` + DVDNAV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dvdnav > 4.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DVDNAV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DVDNAV_PKG_ERRORS" >&5 - enable_dvdnav=no + enable_dvdnav=no if test x"$enable_dvdnav" = "xyes" then : as_fn_error $? "Library dvdnav > 4.9.0 needed for dvdnav was not found" "$LINENO" 5 @@ -36090,7 +36031,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dvdnav=no + enable_dvdnav=no if test x"$enable_dvdnav" = "xyes" then : as_fn_error $? "Library dvdnav > 4.9.0 needed for dvdnav was not found" "$LINENO" 5 @@ -36100,11 +36041,11 @@ fi else - DVDNAV_CFLAGS=$pkg_cv_DVDNAV_CFLAGS - DVDNAV_LIBS=$pkg_cv_DVDNAV_LIBS + DVDNAV_CFLAGS=$pkg_cv_DVDNAV_CFLAGS + DVDNAV_LIBS=$pkg_cv_DVDNAV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dvdnav=yes + enable_dvdnav=yes LTLIBdvdnav=libdvdnav_plugin.la @@ -36249,14 +36190,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BLURAY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` + BLURAY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` else - BLURAY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` + BLURAY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$BLURAY_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$BLURAY_PKG_ERRORS" >&5 - if test x"$enable_bluray" = "xyes" + if test x"$enable_bluray" = "xyes" then : as_fn_error $? "Library libbluray >= 0.6.2 needed for bluray was not found" "$LINENO" 5 else $as_nop @@ -36267,7 +36208,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_bluray" = "xyes" + if test x"$enable_bluray" = "xyes" then : as_fn_error $? "Library libbluray >= 0.6.2 needed for bluray was not found" "$LINENO" 5 else $as_nop @@ -36276,11 +36217,11 @@ fi else - BLURAY_CFLAGS=$pkg_cv_BLURAY_CFLAGS - BLURAY_LIBS=$pkg_cv_BLURAY_LIBS + BLURAY_CFLAGS=$pkg_cv_BLURAY_CFLAGS + BLURAY_LIBS=$pkg_cv_BLURAY_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBlibbluray=liblibbluray_plugin.la + LTLIBlibbluray=liblibbluray_plugin.la @@ -36351,14 +36292,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BLURAY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` + BLURAY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` else - BLURAY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` + BLURAY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbluray >= 0.6.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$BLURAY_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$BLURAY_PKG_ERRORS" >&5 - enable_bluray=no + enable_bluray=no if test x"$enable_bluray" = "xyes" then : as_fn_error $? "Library libbluray >= 0.6.2 needed for bluray was not found" "$LINENO" 5 @@ -36370,7 +36311,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_bluray=no + enable_bluray=no if test x"$enable_bluray" = "xyes" then : as_fn_error $? "Library libbluray >= 0.6.2 needed for bluray was not found" "$LINENO" 5 @@ -36380,11 +36321,11 @@ fi else - BLURAY_CFLAGS=$pkg_cv_BLURAY_CFLAGS - BLURAY_LIBS=$pkg_cv_BLURAY_LIBS + BLURAY_CFLAGS=$pkg_cv_BLURAY_CFLAGS + BLURAY_LIBS=$pkg_cv_BLURAY_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_bluray=yes + enable_bluray=yes LTLIBlibbluray=liblibbluray_plugin.la @@ -36499,14 +36440,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opencv > 2.0" 2>&1` + OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opencv > 2.0" 2>&1` else - OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opencv > 2.0" 2>&1` + OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opencv > 2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OPENCV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OPENCV_PKG_ERRORS" >&5 - if test x"$enable_opencv" = "xyes" + if test x"$enable_opencv" = "xyes" then : as_fn_error $? "Library opencv > 2.0 needed for opencv was not found" "$LINENO" 5 else $as_nop @@ -36517,7 +36458,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_opencv" = "xyes" + if test x"$enable_opencv" = "xyes" then : as_fn_error $? "Library opencv > 2.0 needed for opencv was not found" "$LINENO" 5 else $as_nop @@ -36526,11 +36467,11 @@ fi else - OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS - OPENCV_LIBS=$pkg_cv_OPENCV_LIBS + OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS + OPENCV_LIBS=$pkg_cv_OPENCV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBopencv_example=libopencv_example_plugin.la + LTLIBopencv_example=libopencv_example_plugin.la LTLIBopencv_wrapper=libopencv_wrapper_plugin.la @@ -36610,14 +36551,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opencv > 2.0" 2>&1` + OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opencv > 2.0" 2>&1` else - OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opencv > 2.0" 2>&1` + OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opencv > 2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OPENCV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OPENCV_PKG_ERRORS" >&5 - enable_opencv=no + enable_opencv=no if test x"$enable_opencv" = "xyes" then : as_fn_error $? "Library opencv > 2.0 needed for opencv was not found" "$LINENO" 5 @@ -36629,7 +36570,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_opencv=no + enable_opencv=no if test x"$enable_opencv" = "xyes" then : as_fn_error $? "Library opencv > 2.0 needed for opencv was not found" "$LINENO" 5 @@ -36639,11 +36580,11 @@ fi else - OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS - OPENCV_LIBS=$pkg_cv_OPENCV_LIBS + OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS + OPENCV_LIBS=$pkg_cv_OPENCV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_opencv=yes + enable_opencv=yes LTLIBopencv_example=libopencv_example_plugin.la @@ -36768,14 +36709,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "smbclient" 2>&1` + SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "smbclient" 2>&1` else - SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "smbclient" 2>&1` + SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "smbclient" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SMBCLIENT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SMBCLIENT_PKG_ERRORS" >&5 - if test x"$enable_smbclient" = "xyes" + if test x"$enable_smbclient" = "xyes" then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 else $as_nop @@ -36786,7 +36727,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_smbclient" = "xyes" + if test x"$enable_smbclient" = "xyes" then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 else $as_nop @@ -36795,11 +36736,11 @@ fi else - SMBCLIENT_CFLAGS=$pkg_cv_SMBCLIENT_CFLAGS - SMBCLIENT_LIBS=$pkg_cv_SMBCLIENT_LIBS + SMBCLIENT_CFLAGS=$pkg_cv_SMBCLIENT_CFLAGS + SMBCLIENT_LIBS=$pkg_cv_SMBCLIENT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsmb=libsmb_plugin.la + LTLIBsmb=libsmb_plugin.la @@ -36870,14 +36811,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "smbclient" 2>&1` + SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "smbclient" 2>&1` else - SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "smbclient" 2>&1` + SMBCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "smbclient" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SMBCLIENT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SMBCLIENT_PKG_ERRORS" >&5 - enable_smbclient=no + enable_smbclient=no if test x"$enable_smbclient" = "xyes" then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 @@ -36889,7 +36830,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_smbclient=no + enable_smbclient=no if test x"$enable_smbclient" = "xyes" then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 @@ -36899,11 +36840,11 @@ fi else - SMBCLIENT_CFLAGS=$pkg_cv_SMBCLIENT_CFLAGS - SMBCLIENT_LIBS=$pkg_cv_SMBCLIENT_LIBS + SMBCLIENT_CFLAGS=$pkg_cv_SMBCLIENT_CFLAGS + SMBCLIENT_LIBS=$pkg_cv_SMBCLIENT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_smbclient=yes + enable_smbclient=yes LTLIBsmb=libsmb_plugin.la @@ -37031,14 +36972,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` + DSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` else - DSM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` + DSM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DSM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DSM_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libdsm >= 0.2.0) were not met: + as_fn_error $? "Package requirements (libdsm >= 0.2.0) were not met: $DSM_PKG_ERRORS @@ -37051,7 +36992,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -37064,8 +37005,8 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - DSM_CFLAGS=$pkg_cv_DSM_CFLAGS - DSM_LIBS=$pkg_cv_DSM_LIBS + DSM_CFLAGS=$pkg_cv_DSM_CFLAGS + DSM_LIBS=$pkg_cv_DSM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -37142,26 +37083,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` + DSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` else - DSM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` + DSM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdsm >= 0.2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DSM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DSM_PKG_ERRORS" >&5 - enable_dsm=no + enable_dsm=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dsm=no + enable_dsm=no else - DSM_CFLAGS=$pkg_cv_DSM_CFLAGS - DSM_LIBS=$pkg_cv_DSM_LIBS + DSM_CFLAGS=$pkg_cv_DSM_CFLAGS + DSM_LIBS=$pkg_cv_DSM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dsm=yes + enable_dsm=yes @@ -37281,14 +37222,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SFTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2" 2>&1` + SFTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2" 2>&1` else - SFTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2" 2>&1` + SFTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SFTP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SFTP_PKG_ERRORS" >&5 - if test x"$enable_sftp" = "xyes" + if test x"$enable_sftp" = "xyes" then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 else $as_nop @@ -37299,7 +37240,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_sftp" = "xyes" + if test x"$enable_sftp" = "xyes" then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 else $as_nop @@ -37308,11 +37249,11 @@ fi else - SFTP_CFLAGS=$pkg_cv_SFTP_CFLAGS - SFTP_LIBS=$pkg_cv_SFTP_LIBS + SFTP_CFLAGS=$pkg_cv_SFTP_CFLAGS + SFTP_LIBS=$pkg_cv_SFTP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsftp=libsftp_plugin.la + LTLIBsftp=libsftp_plugin.la @@ -37383,14 +37324,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SFTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2" 2>&1` + SFTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2" 2>&1` else - SFTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2" 2>&1` + SFTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SFTP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SFTP_PKG_ERRORS" >&5 - enable_sftp=no + enable_sftp=no if test x"$enable_sftp" = "xyes" then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 @@ -37402,7 +37343,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_sftp=no + enable_sftp=no if test x"$enable_sftp" = "xyes" then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 @@ -37412,11 +37353,11 @@ fi else - SFTP_CFLAGS=$pkg_cv_SFTP_CFLAGS - SFTP_LIBS=$pkg_cv_SFTP_LIBS + SFTP_CFLAGS=$pkg_cv_SFTP_CFLAGS + SFTP_LIBS=$pkg_cv_SFTP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_sftp=yes + enable_sftp=yes LTLIBsftp=libsftp_plugin.la @@ -37531,14 +37472,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` + NFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` else - NFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` + NFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NFS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NFS_PKG_ERRORS" >&5 - if test x"$enable_nfs" = "xyes" + if test x"$enable_nfs" = "xyes" then : as_fn_error $? "Library libnfs >= 1.10.0 needed for nfs was not found" "$LINENO" 5 else $as_nop @@ -37549,7 +37490,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_nfs" = "xyes" + if test x"$enable_nfs" = "xyes" then : as_fn_error $? "Library libnfs >= 1.10.0 needed for nfs was not found" "$LINENO" 5 else $as_nop @@ -37558,11 +37499,11 @@ fi else - NFS_CFLAGS=$pkg_cv_NFS_CFLAGS - NFS_LIBS=$pkg_cv_NFS_LIBS + NFS_CFLAGS=$pkg_cv_NFS_CFLAGS + NFS_LIBS=$pkg_cv_NFS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBnfs=libnfs_plugin.la + LTLIBnfs=libnfs_plugin.la @@ -37633,14 +37574,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` + NFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` else - NFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` + NFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfs >= 1.10.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NFS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NFS_PKG_ERRORS" >&5 - enable_nfs=no + enable_nfs=no if test x"$enable_nfs" = "xyes" then : as_fn_error $? "Library libnfs >= 1.10.0 needed for nfs was not found" "$LINENO" 5 @@ -37652,7 +37593,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_nfs=no + enable_nfs=no if test x"$enable_nfs" = "xyes" then : as_fn_error $? "Library libnfs >= 1.10.0 needed for nfs was not found" "$LINENO" 5 @@ -37662,11 +37603,11 @@ fi else - NFS_CFLAGS=$pkg_cv_NFS_CFLAGS - NFS_LIBS=$pkg_cv_NFS_LIBS + NFS_CFLAGS=$pkg_cv_NFS_CFLAGS + NFS_LIBS=$pkg_cv_NFS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_nfs=yes + enable_nfs=yes LTLIBnfs=libnfs_plugin.la @@ -37781,14 +37722,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SMB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` + SMB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` else - SMB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` + SMB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SMB2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SMB2_PKG_ERRORS" >&5 - if test x"$enable_smb2" = "xyes" + if test x"$enable_smb2" = "xyes" then : as_fn_error $? "Library libsmb2 >= 3.0.0 needed for smb2 was not found" "$LINENO" 5 else $as_nop @@ -37799,7 +37740,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_smb2" = "xyes" + if test x"$enable_smb2" = "xyes" then : as_fn_error $? "Library libsmb2 >= 3.0.0 needed for smb2 was not found" "$LINENO" 5 else $as_nop @@ -37808,11 +37749,11 @@ fi else - SMB2_CFLAGS=$pkg_cv_SMB2_CFLAGS - SMB2_LIBS=$pkg_cv_SMB2_LIBS + SMB2_CFLAGS=$pkg_cv_SMB2_CFLAGS + SMB2_LIBS=$pkg_cv_SMB2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsmb2=libsmb2_plugin.la + LTLIBsmb2=libsmb2_plugin.la @@ -37883,14 +37824,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SMB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` + SMB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` else - SMB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` + SMB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsmb2 >= 3.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SMB2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SMB2_PKG_ERRORS" >&5 - enable_smb2=no + enable_smb2=no if test x"$enable_smb2" = "xyes" then : as_fn_error $? "Library libsmb2 >= 3.0.0 needed for smb2 was not found" "$LINENO" 5 @@ -37902,7 +37843,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_smb2=no + enable_smb2=no if test x"$enable_smb2" = "xyes" then : as_fn_error $? "Library libsmb2 >= 3.0.0 needed for smb2 was not found" "$LINENO" 5 @@ -37912,11 +37853,11 @@ fi else - SMB2_CFLAGS=$pkg_cv_SMB2_CFLAGS - SMB2_LIBS=$pkg_cv_SMB2_LIBS + SMB2_CFLAGS=$pkg_cv_SMB2_CFLAGS + SMB2_LIBS=$pkg_cv_SMB2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_smb2=yes + enable_smb2=yes LTLIBsmb2=libsmb2_plugin.la @@ -38257,27 +38198,27 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcddb >= 0.9.5" 2>&1` + LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcddb >= 0.9.5" 2>&1` else - LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcddb >= 0.9.5" 2>&1` + LIBCDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcddb >= 0.9.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBCDDB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBCDDB_PKG_ERRORS" >&5 - : + : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBCDDB_PKG_ERRORS}: CDDB access disabled." >&5 printf "%s\n" "$as_me: WARNING: ${LIBCDDB_PKG_ERRORS}: CDDB access disabled." >&2;} HAVE_LIBCDDB=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBCDDB_PKG_ERRORS}: CDDB access disabled." >&5 printf "%s\n" "$as_me: WARNING: ${LIBCDDB_PKG_ERRORS}: CDDB access disabled." >&2;} HAVE_LIBCDDB=no else - LIBCDDB_CFLAGS=$pkg_cv_LIBCDDB_CFLAGS - LIBCDDB_LIBS=$pkg_cv_LIBCDDB_LIBS + LIBCDDB_CFLAGS=$pkg_cv_LIBCDDB_CFLAGS + LIBCDDB_LIBS=$pkg_cv_LIBCDDB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -38466,14 +38407,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` + VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` else - VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` + VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VNC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VNC_PKG_ERRORS" >&5 - if test x"$enable_vnc" = "xyes" + if test x"$enable_vnc" = "xyes" then : as_fn_error $? "Library libvncclient >= 0.9.9 needed for vnc was not found" "$LINENO" 5 else $as_nop @@ -38484,7 +38425,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_vnc" = "xyes" + if test x"$enable_vnc" = "xyes" then : as_fn_error $? "Library libvncclient >= 0.9.9 needed for vnc was not found" "$LINENO" 5 else $as_nop @@ -38493,11 +38434,11 @@ fi else - VNC_CFLAGS=$pkg_cv_VNC_CFLAGS - VNC_LIBS=$pkg_cv_VNC_LIBS + VNC_CFLAGS=$pkg_cv_VNC_CFLAGS + VNC_LIBS=$pkg_cv_VNC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBvnc=libvnc_plugin.la + LTLIBvnc=libvnc_plugin.la @@ -38568,14 +38509,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` + VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` else - VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` + VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvncclient >= 0.9.9" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VNC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VNC_PKG_ERRORS" >&5 - enable_vnc=no + enable_vnc=no if test x"$enable_vnc" = "xyes" then : as_fn_error $? "Library libvncclient >= 0.9.9 needed for vnc was not found" "$LINENO" 5 @@ -38587,7 +38528,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_vnc=no + enable_vnc=no if test x"$enable_vnc" = "xyes" then : as_fn_error $? "Library libvncclient >= 0.9.9 needed for vnc was not found" "$LINENO" 5 @@ -38597,11 +38538,11 @@ fi else - VNC_CFLAGS=$pkg_cv_VNC_CFLAGS - VNC_LIBS=$pkg_cv_VNC_LIBS + VNC_CFLAGS=$pkg_cv_VNC_CFLAGS + VNC_LIBS=$pkg_cv_VNC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_vnc=yes + enable_vnc=yes LTLIBvnc=libvnc_plugin.la @@ -38716,14 +38657,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FREERDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` + FREERDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` else - FREERDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` + FREERDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FREERDP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FREERDP_PKG_ERRORS" >&5 - if test x"$enable_freerdp" = "xyes" + if test x"$enable_freerdp" = "xyes" then : as_fn_error $? "Library freerdp >= 1.0.1 needed for freerdp was not found" "$LINENO" 5 else $as_nop @@ -38734,7 +38675,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_freerdp" = "xyes" + if test x"$enable_freerdp" = "xyes" then : as_fn_error $? "Library freerdp >= 1.0.1 needed for freerdp was not found" "$LINENO" 5 else $as_nop @@ -38743,11 +38684,11 @@ fi else - FREERDP_CFLAGS=$pkg_cv_FREERDP_CFLAGS - FREERDP_LIBS=$pkg_cv_FREERDP_LIBS + FREERDP_CFLAGS=$pkg_cv_FREERDP_CFLAGS + FREERDP_LIBS=$pkg_cv_FREERDP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBrdp=librdp_plugin.la + LTLIBrdp=librdp_plugin.la @@ -38818,14 +38759,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FREERDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` + FREERDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` else - FREERDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` + FREERDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freerdp >= 1.0.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FREERDP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FREERDP_PKG_ERRORS" >&5 - enable_freerdp=no + enable_freerdp=no if test x"$enable_freerdp" = "xyes" then : as_fn_error $? "Library freerdp >= 1.0.1 needed for freerdp was not found" "$LINENO" 5 @@ -38837,7 +38778,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_freerdp=no + enable_freerdp=no if test x"$enable_freerdp" = "xyes" then : as_fn_error $? "Library freerdp >= 1.0.1 needed for freerdp was not found" "$LINENO" 5 @@ -38847,11 +38788,11 @@ fi else - FREERDP_CFLAGS=$pkg_cv_FREERDP_CFLAGS - FREERDP_LIBS=$pkg_cv_FREERDP_LIBS + FREERDP_CFLAGS=$pkg_cv_FREERDP_CFLAGS + FREERDP_LIBS=$pkg_cv_FREERDP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_freerdp=yes + enable_freerdp=yes LTLIBrdp=librdp_plugin.la @@ -39029,14 +38970,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ASDCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "asdcplib" 2>&1` + ASDCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "asdcplib" 2>&1` else - ASDCP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "asdcplib" 2>&1` + ASDCP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "asdcplib" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ASDCP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ASDCP_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (asdcplib) were not met: + as_fn_error $? "Package requirements (asdcplib) were not met: $ASDCP_PKG_ERRORS @@ -39049,7 +38990,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -39062,11 +39003,11 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - ASDCP_CFLAGS=$pkg_cv_ASDCP_CFLAGS - ASDCP_LIBS=$pkg_cv_ASDCP_LIBS + ASDCP_CFLAGS=$pkg_cv_ASDCP_CFLAGS + ASDCP_LIBS=$pkg_cv_ASDCP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_asdcp="yes" + have_asdcp="yes" fi ;; #( auto) : @@ -39121,26 +39062,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ASDCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "asdcplib" 2>&1` + ASDCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "asdcplib" 2>&1` else - ASDCP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "asdcplib" 2>&1` + ASDCP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "asdcplib" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ASDCP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ASDCP_PKG_ERRORS" >&5 - enable_asdcp=no + enable_asdcp=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_asdcp=no + enable_asdcp=no else - ASDCP_CFLAGS=$pkg_cv_ASDCP_CFLAGS - ASDCP_LIBS=$pkg_cv_ASDCP_LIBS + ASDCP_CFLAGS=$pkg_cv_ASDCP_CFLAGS + ASDCP_LIBS=$pkg_cv_ASDCP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_asdcp=yes + enable_asdcp=yes have_asdcp="yes" fi ;; #( *) : @@ -39240,14 +39181,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DVBPSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` + DVBPSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` else - DVBPSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` + DVBPSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DVBPSI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DVBPSI_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libdvbpsi >= 1.2.0) were not met: + as_fn_error $? "Package requirements (libdvbpsi >= 1.2.0) were not met: $DVBPSI_PKG_ERRORS @@ -39260,7 +39201,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -39273,11 +39214,11 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - DVBPSI_CFLAGS=$pkg_cv_DVBPSI_CFLAGS - DVBPSI_LIBS=$pkg_cv_DVBPSI_LIBS + DVBPSI_CFLAGS=$pkg_cv_DVBPSI_CFLAGS + DVBPSI_LIBS=$pkg_cv_DVBPSI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_dvbpsi="yes" + have_dvbpsi="yes" fi ;; #( auto) : @@ -39332,26 +39273,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DVBPSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` + DVBPSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` else - DVBPSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` + DVBPSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdvbpsi >= 1.2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DVBPSI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DVBPSI_PKG_ERRORS" >&5 - enable_dvbpsi=no + enable_dvbpsi=no elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dvbpsi=no + enable_dvbpsi=no else - DVBPSI_CFLAGS=$pkg_cv_DVBPSI_CFLAGS - DVBPSI_LIBS=$pkg_cv_DVBPSI_LIBS + DVBPSI_CFLAGS=$pkg_cv_DVBPSI_CFLAGS + DVBPSI_LIBS=$pkg_cv_DVBPSI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dvbpsi=yes + enable_dvbpsi=yes have_dvbpsi="yes" fi ;; #( *) : @@ -39452,14 +39393,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgme" 2>&1` + GME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgme" 2>&1` else - GME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgme" 2>&1` + GME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgme" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GME_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GME_PKG_ERRORS" >&5 - if test x"$enable_gme" = "xyes" + if test x"$enable_gme" = "xyes" then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 else $as_nop @@ -39470,7 +39411,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_gme" = "xyes" + if test x"$enable_gme" = "xyes" then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 else $as_nop @@ -39479,11 +39420,11 @@ fi else - GME_CFLAGS=$pkg_cv_GME_CFLAGS - GME_LIBS=$pkg_cv_GME_LIBS + GME_CFLAGS=$pkg_cv_GME_CFLAGS + GME_LIBS=$pkg_cv_GME_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBgme=libgme_plugin.la + LTLIBgme=libgme_plugin.la @@ -39554,14 +39495,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgme" 2>&1` + GME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgme" 2>&1` else - GME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgme" 2>&1` + GME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgme" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GME_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GME_PKG_ERRORS" >&5 - enable_gme=no + enable_gme=no if test x"$enable_gme" = "xyes" then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 @@ -39573,7 +39514,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_gme=no + enable_gme=no if test x"$enable_gme" = "xyes" then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 @@ -39583,11 +39524,11 @@ fi else - GME_CFLAGS=$pkg_cv_GME_CFLAGS - GME_LIBS=$pkg_cv_GME_LIBS + GME_CFLAGS=$pkg_cv_GME_CFLAGS + GME_LIBS=$pkg_cv_GME_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_gme=yes + enable_gme=yes LTLIBgme=libgme_plugin.la @@ -39685,12 +39626,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplay2" 2>&1` + SID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplay2" 2>&1` else - SID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplay2" 2>&1` + SID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplay2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SID_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SID_PKG_ERRORS" >&5 if test "x${enable_sid}" = "xyes" @@ -39716,8 +39657,8 @@ fi else - SID_CFLAGS=$pkg_cv_SID_CFLAGS - SID_LIBS=$pkg_cv_SID_LIBS + SID_CFLAGS=$pkg_cv_SID_CFLAGS + SID_LIBS=$pkg_cv_SID_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -39857,14 +39798,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` else - OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OGG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OGG_PKG_ERRORS" >&5 - if test x"$enable_ogg" = "xyes" + if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 else $as_nop @@ -39875,7 +39816,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_ogg" = "xyes" + if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 else $as_nop @@ -39884,11 +39825,11 @@ fi else - OGG_CFLAGS=$pkg_cv_OGG_CFLAGS - OGG_LIBS=$pkg_cv_OGG_LIBS + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBmux_ogg=libmux_ogg_plugin.la + LTLIBmux_ogg=libmux_ogg_plugin.la @@ -39959,14 +39900,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` else - OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OGG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OGG_PKG_ERRORS" >&5 - enable_ogg=no + enable_ogg=no if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 @@ -39978,7 +39919,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_ogg=no + enable_ogg=no if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 @@ -39988,11 +39929,11 @@ fi else - OGG_CFLAGS=$pkg_cv_OGG_CFLAGS - OGG_LIBS=$pkg_cv_OGG_LIBS + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_ogg=yes + enable_ogg=yes LTLIBmux_ogg=libmux_ogg_plugin.la @@ -40079,21 +40020,21 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vorbis >= 1.1" 2>&1` + LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vorbis >= 1.1" 2>&1` else - LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vorbis >= 1.1" 2>&1` + LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vorbis >= 1.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBVORBIS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBVORBIS_PKG_ERRORS" >&5 - true + true elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - true + true else - LIBVORBIS_CFLAGS=$pkg_cv_LIBVORBIS_CFLAGS - LIBVORBIS_LIBS=$pkg_cv_LIBVORBIS_LIBS + LIBVORBIS_CFLAGS=$pkg_cv_LIBVORBIS_CFLAGS + LIBVORBIS_LIBS=$pkg_cv_LIBVORBIS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -40181,14 +40122,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` else - OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OGG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OGG_PKG_ERRORS" >&5 - if test x"$enable_ogg" = "xyes" + if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 else $as_nop @@ -40199,7 +40140,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_ogg" = "xyes" + if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 else $as_nop @@ -40208,11 +40149,11 @@ fi else - OGG_CFLAGS=$pkg_cv_OGG_CFLAGS - OGG_LIBS=$pkg_cv_OGG_LIBS + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBogg=libogg_plugin.la + LTLIBogg=libogg_plugin.la @@ -40283,14 +40224,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0" 2>&1` else - OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` + OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OGG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OGG_PKG_ERRORS" >&5 - enable_ogg=no + enable_ogg=no if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 @@ -40302,7 +40243,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_ogg=no + enable_ogg=no if test x"$enable_ogg" = "xyes" then : as_fn_error $? "Library ogg >= 1.0 needed for ogg was not found" "$LINENO" 5 @@ -40312,11 +40253,11 @@ fi else - OGG_CFLAGS=$pkg_cv_OGG_CFLAGS - OGG_LIBS=$pkg_cv_OGG_LIBS + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_ogg=yes + enable_ogg=yes LTLIBogg=libogg_plugin.la @@ -40431,14 +40372,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shout >= 2.1" 2>&1` + SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shout >= 2.1" 2>&1` else - SHOUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shout >= 2.1" 2>&1` + SHOUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shout >= 2.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SHOUT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SHOUT_PKG_ERRORS" >&5 - if test x"$enable_shout" = "xyes" + if test x"$enable_shout" = "xyes" then : as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5 else $as_nop @@ -40449,7 +40390,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_shout" = "xyes" + if test x"$enable_shout" = "xyes" then : as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5 else $as_nop @@ -40458,11 +40399,11 @@ fi else - SHOUT_CFLAGS=$pkg_cv_SHOUT_CFLAGS - SHOUT_LIBS=$pkg_cv_SHOUT_LIBS + SHOUT_CFLAGS=$pkg_cv_SHOUT_CFLAGS + SHOUT_LIBS=$pkg_cv_SHOUT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBaccess_output_shout=libaccess_output_shout_plugin.la + LTLIBaccess_output_shout=libaccess_output_shout_plugin.la @@ -40533,14 +40474,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shout >= 2.1" 2>&1` + SHOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shout >= 2.1" 2>&1` else - SHOUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shout >= 2.1" 2>&1` + SHOUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shout >= 2.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SHOUT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SHOUT_PKG_ERRORS" >&5 - enable_shout=no + enable_shout=no if test x"$enable_shout" = "xyes" then : as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5 @@ -40552,7 +40493,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_shout=no + enable_shout=no if test x"$enable_shout" = "xyes" then : as_fn_error $? "Library shout >= 2.1 needed for shout was not found" "$LINENO" 5 @@ -40562,11 +40503,11 @@ fi else - SHOUT_CFLAGS=$pkg_cv_SHOUT_CFLAGS - SHOUT_LIBS=$pkg_cv_SHOUT_LIBS + SHOUT_CFLAGS=$pkg_cv_SHOUT_CFLAGS + SHOUT_LIBS=$pkg_cv_SHOUT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_shout=yes + enable_shout=yes LTLIBaccess_output_shout=libaccess_output_shout_plugin.la @@ -40682,14 +40623,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MATROSKA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` + MATROSKA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` else - MATROSKA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` + MATROSKA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MATROSKA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MATROSKA_PKG_ERRORS" >&5 - if test x"$enable_matroska" = "xyes" + if test x"$enable_matroska" = "xyes" then : as_fn_error $? "Library libebml >= 1.3.6 libmatroska needed for matroska was not found" "$LINENO" 5 else $as_nop @@ -40700,7 +40641,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_matroska" = "xyes" + if test x"$enable_matroska" = "xyes" then : as_fn_error $? "Library libebml >= 1.3.6 libmatroska needed for matroska was not found" "$LINENO" 5 else $as_nop @@ -40709,11 +40650,11 @@ fi else - MATROSKA_CFLAGS=$pkg_cv_MATROSKA_CFLAGS - MATROSKA_LIBS=$pkg_cv_MATROSKA_LIBS + MATROSKA_CFLAGS=$pkg_cv_MATROSKA_CFLAGS + MATROSKA_LIBS=$pkg_cv_MATROSKA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBmkv=libmkv_plugin.la + LTLIBmkv=libmkv_plugin.la @@ -40784,14 +40725,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MATROSKA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` + MATROSKA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` else - MATROSKA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` + MATROSKA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libebml >= 1.3.6 libmatroska" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MATROSKA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MATROSKA_PKG_ERRORS" >&5 - enable_matroska=no + enable_matroska=no if test x"$enable_matroska" = "xyes" then : as_fn_error $? "Library libebml >= 1.3.6 libmatroska needed for matroska was not found" "$LINENO" 5 @@ -40803,7 +40744,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_matroska=no + enable_matroska=no if test x"$enable_matroska" = "xyes" then : as_fn_error $? "Library libebml >= 1.3.6 libmatroska needed for matroska was not found" "$LINENO" 5 @@ -40813,11 +40754,11 @@ fi else - MATROSKA_CFLAGS=$pkg_cv_MATROSKA_CFLAGS - MATROSKA_LIBS=$pkg_cv_MATROSKA_LIBS + MATROSKA_CFLAGS=$pkg_cv_MATROSKA_CFLAGS + MATROSKA_LIBS=$pkg_cv_MATROSKA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_matroska=yes + enable_matroska=yes LTLIBmkv=libmkv_plugin.la @@ -40912,12 +40853,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmodplug >= 0.8.9.0" 2>&1` + LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmodplug >= 0.8.9.0" 2>&1` else - LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmodplug >= 0.8.9.0" 2>&1` + LIBMODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmodplug >= 0.8.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBMODPLUG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBMODPLUG_PKG_ERRORS" >&5 if test -n "${enable_mod}" @@ -40941,8 +40882,8 @@ fi else - LIBMODPLUG_CFLAGS=$pkg_cv_LIBMODPLUG_CFLAGS - LIBMODPLUG_LIBS=$pkg_cv_LIBMODPLUG_LIBS + LIBMODPLUG_CFLAGS=$pkg_cv_LIBMODPLUG_CFLAGS + LIBMODPLUG_LIBS=$pkg_cv_LIBMODPLUG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -41127,14 +41068,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SHINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` + SHINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` else - SHINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` + SHINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SHINE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SHINE_PKG_ERRORS" >&5 - if test x"$enable_shine" = "xyes" + if test x"$enable_shine" = "xyes" then : as_fn_error $? "Library shine >= 3.0.0 needed for shine was not found" "$LINENO" 5 else $as_nop @@ -41145,7 +41086,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_shine" = "xyes" + if test x"$enable_shine" = "xyes" then : as_fn_error $? "Library shine >= 3.0.0 needed for shine was not found" "$LINENO" 5 else $as_nop @@ -41154,11 +41095,11 @@ fi else - SHINE_CFLAGS=$pkg_cv_SHINE_CFLAGS - SHINE_LIBS=$pkg_cv_SHINE_LIBS + SHINE_CFLAGS=$pkg_cv_SHINE_CFLAGS + SHINE_LIBS=$pkg_cv_SHINE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBshine=libshine_plugin.la + LTLIBshine=libshine_plugin.la @@ -41229,14 +41170,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SHINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` + SHINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` else - SHINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` + SHINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "shine >= 3.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SHINE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SHINE_PKG_ERRORS" >&5 - enable_shine=no + enable_shine=no if test x"$enable_shine" = "xyes" then : as_fn_error $? "Library shine >= 3.0.0 needed for shine was not found" "$LINENO" 5 @@ -41248,7 +41189,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_shine=no + enable_shine=no if test x"$enable_shine" = "xyes" then : as_fn_error $? "Library shine >= 3.0.0 needed for shine was not found" "$LINENO" 5 @@ -41258,11 +41199,11 @@ fi else - SHINE_CFLAGS=$pkg_cv_SHINE_CFLAGS - SHINE_LIBS=$pkg_cv_SHINE_LIBS + SHINE_CFLAGS=$pkg_cv_SHINE_CFLAGS + SHINE_LIBS=$pkg_cv_SHINE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_shine=yes + enable_shine=yes LTLIBshine=libshine_plugin.la @@ -41646,14 +41587,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123" 2>&1` + MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123" 2>&1` else - MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123" 2>&1` + MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MPG123_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MPG123_PKG_ERRORS" >&5 - if test x"$enable_mpg123" = "xyes" + if test x"$enable_mpg123" = "xyes" then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 else $as_nop @@ -41664,7 +41605,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_mpg123" = "xyes" + if test x"$enable_mpg123" = "xyes" then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 else $as_nop @@ -41673,11 +41614,11 @@ fi else - MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS - MPG123_LIBS=$pkg_cv_MPG123_LIBS + MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS + MPG123_LIBS=$pkg_cv_MPG123_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBmpg123=libmpg123_plugin.la + LTLIBmpg123=libmpg123_plugin.la @@ -41748,14 +41689,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123" 2>&1` + MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123" 2>&1` else - MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123" 2>&1` + MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MPG123_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MPG123_PKG_ERRORS" >&5 - enable_mpg123=no + enable_mpg123=no if test x"$enable_mpg123" = "xyes" then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 @@ -41767,7 +41708,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_mpg123=no + enable_mpg123=no if test x"$enable_mpg123" = "xyes" then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 @@ -41777,11 +41718,11 @@ fi else - MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS - MPG123_LIBS=$pkg_cv_MPG123_LIBS + MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS + MPG123_LIBS=$pkg_cv_MPG123_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_mpg123=yes + enable_mpg123=yes LTLIBmpg123=libmpg123_plugin.la @@ -41880,12 +41821,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GST_APP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-app-1.0" 2>&1` + GST_APP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-app-1.0" 2>&1` else - GST_APP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-app-1.0" 2>&1` + GST_APP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-app-1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GST_APP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GST_APP_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&5 @@ -41899,8 +41840,8 @@ printf "%s\n" "$as_me: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&2;} else - GST_APP_CFLAGS=$pkg_cv_GST_APP_CFLAGS - GST_APP_LIBS=$pkg_cv_GST_APP_LIBS + GST_APP_CFLAGS=$pkg_cv_GST_APP_CFLAGS + GST_APP_LIBS=$pkg_cv_GST_APP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -41956,12 +41897,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GST_VIDEO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-video-1.0" 2>&1` + GST_VIDEO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-video-1.0" 2>&1` else - GST_VIDEO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-video-1.0" 2>&1` + GST_VIDEO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-video-1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GST_VIDEO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GST_VIDEO_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&5 @@ -41975,8 +41916,8 @@ printf "%s\n" "$as_me: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&2;} else - GST_VIDEO_CFLAGS=$pkg_cv_GST_VIDEO_CFLAGS - GST_VIDEO_LIBS=$pkg_cv_GST_VIDEO_LIBS + GST_VIDEO_CFLAGS=$pkg_cv_GST_VIDEO_CFLAGS + GST_VIDEO_LIBS=$pkg_cv_GST_VIDEO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -42111,12 +42052,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" 2>&1` + AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" 2>&1` else - AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" 2>&1` + AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$AVCODEC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$AVCODEC_PKG_ERRORS" >&5 as_fn_error $? "${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error." "$LINENO" 5 @@ -42128,8 +42069,8 @@ as_fn_error $? "${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error." "$LINENO" 5 else - AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS - AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS + AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS + AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -42256,12 +42197,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva >= 0.38" 2>&1` + LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva >= 0.38" 2>&1` else - LIBVA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva >= 0.38" 2>&1` + LIBVA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva >= 0.38" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBVA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBVA_PKG_ERRORS" >&5 if test -n "${enable_libva}" @@ -42293,8 +42234,8 @@ fi else - LIBVA_CFLAGS=$pkg_cv_LIBVA_CFLAGS - LIBVA_LIBS=$pkg_cv_LIBVA_LIBS + LIBVA_CFLAGS=$pkg_cv_LIBVA_CFLAGS + LIBVA_LIBS=$pkg_cv_LIBVA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -42353,12 +42294,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBVA_DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva-drm" 2>&1` + LIBVA_DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva-drm" 2>&1` else - LIBVA_DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva-drm" 2>&1` + LIBVA_DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva-drm" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBVA_DRM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBVA_DRM_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&5 @@ -42372,8 +42313,8 @@ printf "%s\n" "$as_me: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&2;} else - LIBVA_DRM_CFLAGS=$pkg_cv_LIBVA_DRM_CFLAGS - LIBVA_DRM_LIBS=$pkg_cv_LIBVA_DRM_LIBS + LIBVA_DRM_CFLAGS=$pkg_cv_LIBVA_DRM_CFLAGS + LIBVA_DRM_LIBS=$pkg_cv_LIBVA_DRM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -42432,12 +42373,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBVA_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva-x11" 2>&1` + LIBVA_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva-x11" 2>&1` else - LIBVA_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva-x11" 2>&1` + LIBVA_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva-x11" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBVA_X11_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBVA_X11_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&5 @@ -42451,8 +42392,8 @@ printf "%s\n" "$as_me: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&2;} else - LIBVA_X11_CFLAGS=$pkg_cv_LIBVA_X11_CFLAGS - LIBVA_X11_LIBS=$pkg_cv_LIBVA_X11_LIBS + LIBVA_X11_CFLAGS=$pkg_cv_LIBVA_X11_CFLAGS + LIBVA_X11_LIBS=$pkg_cv_LIBVA_X11_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -42511,12 +42452,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBVA_WL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva-wayland" 2>&1` + LIBVA_WL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libva-wayland" 2>&1` else - LIBVA_WL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva-wayland" 2>&1` + LIBVA_WL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libva-wayland" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBVA_WL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBVA_WL_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&5 @@ -42530,8 +42471,8 @@ printf "%s\n" "$as_me: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&2;} else - LIBVA_WL_CFLAGS=$pkg_cv_LIBVA_WL_CFLAGS - LIBVA_WL_LIBS=$pkg_cv_LIBVA_WL_LIBS + LIBVA_WL_CFLAGS=$pkg_cv_LIBVA_WL_CFLAGS + LIBVA_WL_LIBS=$pkg_cv_LIBVA_WL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -42919,12 +42860,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavformat >= 53.21.0 libavcodec libavutil" 2>&1` + AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavformat >= 53.21.0 libavcodec libavutil" 2>&1` else - AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 53.21.0 libavcodec libavutil" 2>&1` + AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 53.21.0 libavcodec libavutil" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$AVFORMAT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$AVFORMAT_PKG_ERRORS" >&5 as_fn_error $? "${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error." "$LINENO" 5 @@ -42936,8 +42877,8 @@ as_fn_error $? "${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error." "$LINENO" 5 else - AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS - AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS + AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS + AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -43067,12 +43008,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SWSCALE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libswscale" 2>&1` + SWSCALE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libswscale" 2>&1` else - SWSCALE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libswscale" 2>&1` + SWSCALE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libswscale" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SWSCALE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SWSCALE_PKG_ERRORS" >&5 as_fn_error $? "${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5 @@ -43084,8 +43025,8 @@ as_fn_error $? "${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing." "$LINENO" 5 else - SWSCALE_CFLAGS=$pkg_cv_SWSCALE_CFLAGS - SWSCALE_LIBS=$pkg_cv_SWSCALE_LIBS + SWSCALE_CFLAGS=$pkg_cv_SWSCALE_CFLAGS + SWSCALE_LIBS=$pkg_cv_SWSCALE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -43215,12 +43156,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpostproc libavutil" 2>&1` + POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpostproc libavutil" 2>&1` else - POSTPROC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpostproc libavutil" 2>&1` + POSTPROC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpostproc libavutil" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$POSTPROC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$POSTPROC_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${POSTPROC_PKG_ERRORS}." >&5 @@ -43234,8 +43175,8 @@ printf "%s\n" "$as_me: WARNING: ${POSTPROC_PKG_ERRORS}." >&2;} else - POSTPROC_CFLAGS=$pkg_cv_POSTPROC_CFLAGS - POSTPROC_LIBS=$pkg_cv_POSTPROC_LIBS + POSTPROC_CFLAGS=$pkg_cv_POSTPROC_CFLAGS + POSTPROC_LIBS=$pkg_cv_POSTPROC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -43449,14 +43390,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aom" 2>&1` + AOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aom" 2>&1` else - AOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aom" 2>&1` + AOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aom" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$AOM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$AOM_PKG_ERRORS" >&5 - if test x"$enable_aom" = "xyes" + if test x"$enable_aom" = "xyes" then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 else $as_nop @@ -43467,7 +43408,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_aom" = "xyes" + if test x"$enable_aom" = "xyes" then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 else $as_nop @@ -43476,11 +43417,11 @@ fi else - AOM_CFLAGS=$pkg_cv_AOM_CFLAGS - AOM_LIBS=$pkg_cv_AOM_LIBS + AOM_CFLAGS=$pkg_cv_AOM_CFLAGS + AOM_LIBS=$pkg_cv_AOM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBaom=libaom_plugin.la + LTLIBaom=libaom_plugin.la @@ -43551,14 +43492,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aom" 2>&1` + AOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aom" 2>&1` else - AOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aom" 2>&1` + AOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aom" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$AOM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$AOM_PKG_ERRORS" >&5 - enable_aom=no + enable_aom=no if test x"$enable_aom" = "xyes" then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 @@ -43570,7 +43511,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_aom=no + enable_aom=no if test x"$enable_aom" = "xyes" then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 @@ -43580,11 +43521,11 @@ fi else - AOM_CFLAGS=$pkg_cv_AOM_CFLAGS - AOM_LIBS=$pkg_cv_AOM_LIBS + AOM_CFLAGS=$pkg_cv_AOM_CFLAGS + AOM_LIBS=$pkg_cv_AOM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_aom=yes + enable_aom=yes LTLIBaom=libaom_plugin.la @@ -43699,14 +43640,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DAV1D_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dav1d" 2>&1` + DAV1D_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dav1d" 2>&1` else - DAV1D_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dav1d" 2>&1` + DAV1D_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dav1d" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DAV1D_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DAV1D_PKG_ERRORS" >&5 - if test x"$enable_dav1d" = "xyes" + if test x"$enable_dav1d" = "xyes" then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 else $as_nop @@ -43717,7 +43658,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_dav1d" = "xyes" + if test x"$enable_dav1d" = "xyes" then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 else $as_nop @@ -43726,11 +43667,11 @@ fi else - DAV1D_CFLAGS=$pkg_cv_DAV1D_CFLAGS - DAV1D_LIBS=$pkg_cv_DAV1D_LIBS + DAV1D_CFLAGS=$pkg_cv_DAV1D_CFLAGS + DAV1D_LIBS=$pkg_cv_DAV1D_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdav1d=libdav1d_plugin.la + LTLIBdav1d=libdav1d_plugin.la @@ -43801,14 +43742,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DAV1D_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dav1d" 2>&1` + DAV1D_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dav1d" 2>&1` else - DAV1D_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dav1d" 2>&1` + DAV1D_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dav1d" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DAV1D_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DAV1D_PKG_ERRORS" >&5 - enable_dav1d=no + enable_dav1d=no if test x"$enable_dav1d" = "xyes" then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 @@ -43820,7 +43761,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dav1d=no + enable_dav1d=no if test x"$enable_dav1d" = "xyes" then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 @@ -43830,11 +43771,11 @@ fi else - DAV1D_CFLAGS=$pkg_cv_DAV1D_CFLAGS - DAV1D_LIBS=$pkg_cv_DAV1D_LIBS + DAV1D_CFLAGS=$pkg_cv_DAV1D_CFLAGS + DAV1D_LIBS=$pkg_cv_DAV1D_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dav1d=yes + enable_dav1d=yes LTLIBdav1d=libdav1d_plugin.la @@ -43931,12 +43872,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VPX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vpx >= 1.5.0" 2>&1` + VPX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vpx >= 1.5.0" 2>&1` else - VPX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vpx >= 1.5.0" 2>&1` + VPX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vpx >= 1.5.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VPX_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VPX_PKG_ERRORS" >&5 if test "${enable_vpx}" = "yes" @@ -43956,8 +43897,8 @@ fi else - VPX_CFLAGS=$pkg_cv_VPX_CFLAGS - VPX_LIBS=$pkg_cv_VPX_LIBS + VPX_CFLAGS=$pkg_cv_VPX_CFLAGS + VPX_LIBS=$pkg_cv_VPX_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -44251,14 +44192,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "twolame" 2>&1` + TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "twolame" 2>&1` else - TWOLAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "twolame" 2>&1` + TWOLAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "twolame" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$TWOLAME_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$TWOLAME_PKG_ERRORS" >&5 - if test x"$enable_twolame" = "xyes" + if test x"$enable_twolame" = "xyes" then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 else $as_nop @@ -44269,7 +44210,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_twolame" = "xyes" + if test x"$enable_twolame" = "xyes" then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 else $as_nop @@ -44278,11 +44219,11 @@ fi else - TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS - TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS + TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS + TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBtwolame=libtwolame_plugin.la + LTLIBtwolame=libtwolame_plugin.la @@ -44358,14 +44299,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "twolame" 2>&1` + TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "twolame" 2>&1` else - TWOLAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "twolame" 2>&1` + TWOLAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "twolame" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$TWOLAME_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$TWOLAME_PKG_ERRORS" >&5 - enable_twolame=no + enable_twolame=no if test x"$enable_twolame" = "xyes" then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 @@ -44377,7 +44318,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_twolame=no + enable_twolame=no if test x"$enable_twolame" = "xyes" then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 @@ -44387,11 +44328,11 @@ fi else - TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS - TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS + TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS + TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_twolame=yes + enable_twolame=yes LTLIBtwolame=libtwolame_plugin.la @@ -44511,14 +44452,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FDKAAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fdk-aac" 2>&1` + FDKAAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fdk-aac" 2>&1` else - FDKAAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fdk-aac" 2>&1` + FDKAAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fdk-aac" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FDKAAC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FDKAAC_PKG_ERRORS" >&5 - if test x"$enable_fdkaac" = "xyes" + if test x"$enable_fdkaac" = "xyes" then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 else $as_nop @@ -44529,7 +44470,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_fdkaac" = "xyes" + if test x"$enable_fdkaac" = "xyes" then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 else $as_nop @@ -44538,11 +44479,11 @@ fi else - FDKAAC_CFLAGS=$pkg_cv_FDKAAC_CFLAGS - FDKAAC_LIBS=$pkg_cv_FDKAAC_LIBS + FDKAAC_CFLAGS=$pkg_cv_FDKAAC_CFLAGS + FDKAAC_LIBS=$pkg_cv_FDKAAC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBfdkaac=libfdkaac_plugin.la + LTLIBfdkaac=libfdkaac_plugin.la @@ -44613,14 +44554,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FDKAAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fdk-aac" 2>&1` + FDKAAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fdk-aac" 2>&1` else - FDKAAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fdk-aac" 2>&1` + FDKAAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fdk-aac" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FDKAAC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FDKAAC_PKG_ERRORS" >&5 - enable_fdkaac=no + enable_fdkaac=no if test x"$enable_fdkaac" = "xyes" then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 @@ -44632,7 +44573,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_fdkaac=no + enable_fdkaac=no if test x"$enable_fdkaac" = "xyes" then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 @@ -44642,11 +44583,11 @@ fi else - FDKAAC_CFLAGS=$pkg_cv_FDKAAC_CFLAGS - FDKAAC_LIBS=$pkg_cv_FDKAAC_LIBS + FDKAAC_CFLAGS=$pkg_cv_FDKAAC_CFLAGS + FDKAAC_LIBS=$pkg_cv_FDKAAC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_fdkaac=yes + enable_fdkaac=yes LTLIBfdkaac=libfdkaac_plugin.la @@ -44883,14 +44824,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` + DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` else - DCA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` + DCA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DCA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DCA_PKG_ERRORS" >&5 - if test x"$enable_dca" = "xyes" + if test x"$enable_dca" = "xyes" then : as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5 else $as_nop @@ -44901,7 +44842,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_dca" = "xyes" + if test x"$enable_dca" = "xyes" then : as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5 else $as_nop @@ -44910,11 +44851,11 @@ fi else - DCA_CFLAGS=$pkg_cv_DCA_CFLAGS - DCA_LIBS=$pkg_cv_DCA_LIBS + DCA_CFLAGS=$pkg_cv_DCA_CFLAGS + DCA_LIBS=$pkg_cv_DCA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdca=libdca_plugin.la + LTLIBdca=libdca_plugin.la @@ -44985,14 +44926,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` + DCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` else - DCA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` + DCA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdca >= 0.0.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DCA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DCA_PKG_ERRORS" >&5 - enable_dca=no + enable_dca=no if test x"$enable_dca" = "xyes" then : as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5 @@ -45004,7 +44945,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_dca=no + enable_dca=no if test x"$enable_dca" = "xyes" then : as_fn_error $? "Library libdca >= 0.0.5 needed for dca was not found" "$LINENO" 5 @@ -45014,11 +44955,11 @@ fi else - DCA_CFLAGS=$pkg_cv_DCA_CFLAGS - DCA_LIBS=$pkg_cv_DCA_LIBS + DCA_CFLAGS=$pkg_cv_DCA_CFLAGS + DCA_LIBS=$pkg_cv_DCA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_dca=yes + enable_dca=yes LTLIBdca=libdca_plugin.la @@ -45133,14 +45074,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac" 2>&1` + FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac" 2>&1` else - FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac" 2>&1` + FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FLAC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FLAC_PKG_ERRORS" >&5 - if test x"$enable_flac" = "xyes" + if test x"$enable_flac" = "xyes" then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 else $as_nop @@ -45151,7 +45092,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_flac" = "xyes" + if test x"$enable_flac" = "xyes" then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 else $as_nop @@ -45160,11 +45101,11 @@ fi else - FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS - FLAC_LIBS=$pkg_cv_FLAC_LIBS + FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS + FLAC_LIBS=$pkg_cv_FLAC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBflac=libflac_plugin.la + LTLIBflac=libflac_plugin.la @@ -45235,14 +45176,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac" 2>&1` + FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac" 2>&1` else - FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac" 2>&1` + FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FLAC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FLAC_PKG_ERRORS" >&5 - enable_flac=no + enable_flac=no if test x"$enable_flac" = "xyes" then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 @@ -45254,7 +45195,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_flac=no + enable_flac=no if test x"$enable_flac" = "xyes" then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 @@ -45264,11 +45205,11 @@ fi else - FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS - FLAC_LIBS=$pkg_cv_FLAC_LIBS + FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS + FLAC_LIBS=$pkg_cv_FLAC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_flac=yes + enable_flac=yes LTLIBflac=libflac_plugin.la @@ -45383,14 +45324,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` + LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` else - LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` + LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBMPEG2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBMPEG2_PKG_ERRORS" >&5 - if test x"$enable_libmpeg2" = "xyes" + if test x"$enable_libmpeg2" = "xyes" then : as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5 else $as_nop @@ -45401,7 +45342,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_libmpeg2" = "xyes" + if test x"$enable_libmpeg2" = "xyes" then : as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5 else $as_nop @@ -45410,11 +45351,11 @@ fi else - LIBMPEG2_CFLAGS=$pkg_cv_LIBMPEG2_CFLAGS - LIBMPEG2_LIBS=$pkg_cv_LIBMPEG2_LIBS + LIBMPEG2_CFLAGS=$pkg_cv_LIBMPEG2_CFLAGS + LIBMPEG2_LIBS=$pkg_cv_LIBMPEG2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBlibmpeg2=liblibmpeg2_plugin.la + LTLIBlibmpeg2=liblibmpeg2_plugin.la @@ -45485,14 +45426,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` + LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` else - LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` + LIBMPEG2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpeg2 > 0.3.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBMPEG2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBMPEG2_PKG_ERRORS" >&5 - enable_libmpeg2=no + enable_libmpeg2=no if test x"$enable_libmpeg2" = "xyes" then : as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5 @@ -45504,7 +45445,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_libmpeg2=no + enable_libmpeg2=no if test x"$enable_libmpeg2" = "xyes" then : as_fn_error $? "Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" "$LINENO" 5 @@ -45514,11 +45455,11 @@ fi else - LIBMPEG2_CFLAGS=$pkg_cv_LIBMPEG2_CFLAGS - LIBMPEG2_LIBS=$pkg_cv_LIBMPEG2_LIBS + LIBMPEG2_CFLAGS=$pkg_cv_LIBMPEG2_CFLAGS + LIBMPEG2_LIBS=$pkg_cv_LIBMPEG2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_libmpeg2=yes + enable_libmpeg2=yes LTLIBlibmpeg2=liblibmpeg2_plugin.la @@ -45633,14 +45574,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` + VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` else - VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` + VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VORBIS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VORBIS_PKG_ERRORS" >&5 - if test x"$enable_vorbis" = "xyes" + if test x"$enable_vorbis" = "xyes" then : as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5 else $as_nop @@ -45651,7 +45592,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_vorbis" = "xyes" + if test x"$enable_vorbis" = "xyes" then : as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5 else $as_nop @@ -45660,11 +45601,11 @@ fi else - VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS - VORBIS_LIBS=$pkg_cv_VORBIS_LIBS + VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS + VORBIS_LIBS=$pkg_cv_VORBIS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBvorbis=libvorbis_plugin.la + LTLIBvorbis=libvorbis_plugin.la @@ -45735,14 +45676,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` + VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` else - VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` + VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VORBIS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VORBIS_PKG_ERRORS" >&5 - enable_vorbis=no + enable_vorbis=no if test x"$enable_vorbis" = "xyes" then : as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5 @@ -45754,7 +45695,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_vorbis=no + enable_vorbis=no if test x"$enable_vorbis" = "xyes" then : as_fn_error $? "Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" "$LINENO" 5 @@ -45764,11 +45705,11 @@ fi else - VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS - VORBIS_LIBS=$pkg_cv_VORBIS_LIBS + VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS + VORBIS_LIBS=$pkg_cv_VORBIS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_vorbis=yes + enable_vorbis=yes LTLIBvorbis=libvorbis_plugin.la @@ -45910,14 +45851,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` + SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` else - SPEEX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` + SPEEX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SPEEX_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SPEEX_PKG_ERRORS" >&5 - if test x"$enable_speex" = "xyes" + if test x"$enable_speex" = "xyes" then : as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5 else $as_nop @@ -45928,7 +45869,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_speex" = "xyes" + if test x"$enable_speex" = "xyes" then : as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5 else $as_nop @@ -45937,11 +45878,11 @@ fi else - SPEEX_CFLAGS=$pkg_cv_SPEEX_CFLAGS - SPEEX_LIBS=$pkg_cv_SPEEX_LIBS + SPEEX_CFLAGS=$pkg_cv_SPEEX_CFLAGS + SPEEX_LIBS=$pkg_cv_SPEEX_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBspeex=libspeex_plugin.la + LTLIBspeex=libspeex_plugin.la @@ -46012,14 +45953,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` + SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` else - SPEEX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` + SPEEX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg speex >= 1.0.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SPEEX_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SPEEX_PKG_ERRORS" >&5 - enable_speex=no + enable_speex=no if test x"$enable_speex" = "xyes" then : as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5 @@ -46031,7 +45972,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_speex=no + enable_speex=no if test x"$enable_speex" = "xyes" then : as_fn_error $? "Library ogg speex >= 1.0.5 needed for speex was not found" "$LINENO" 5 @@ -46041,11 +45982,11 @@ fi else - SPEEX_CFLAGS=$pkg_cv_SPEEX_CFLAGS - SPEEX_LIBS=$pkg_cv_SPEEX_LIBS + SPEEX_CFLAGS=$pkg_cv_SPEEX_CFLAGS + SPEEX_LIBS=$pkg_cv_SPEEX_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_speex=yes + enable_speex=yes LTLIBspeex=libspeex_plugin.la @@ -46136,12 +46077,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "speexdsp" 2>&1` + SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "speexdsp" 2>&1` else - SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "speexdsp" 2>&1` + SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "speexdsp" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SPEEXDSP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SPEEXDSP_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&5 @@ -46155,8 +46096,8 @@ printf "%s\n" "$as_me: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&2;} else - SPEEXDSP_CFLAGS=$pkg_cv_SPEEXDSP_CFLAGS - SPEEXDSP_LIBS=$pkg_cv_SPEEXDSP_LIBS + SPEEXDSP_CFLAGS=$pkg_cv_SPEEXDSP_CFLAGS + SPEEXDSP_LIBS=$pkg_cv_SPEEXDSP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -46253,14 +46194,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` + OPUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` else - OPUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` + OPUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OPUS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OPUS_PKG_ERRORS" >&5 - if test x"$enable_opus" = "xyes" + if test x"$enable_opus" = "xyes" then : as_fn_error $? "Library ogg opus >= 1.0.3 needed for opus was not found" "$LINENO" 5 else $as_nop @@ -46271,7 +46212,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_opus" = "xyes" + if test x"$enable_opus" = "xyes" then : as_fn_error $? "Library ogg opus >= 1.0.3 needed for opus was not found" "$LINENO" 5 else $as_nop @@ -46280,11 +46221,11 @@ fi else - OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS - OPUS_LIBS=$pkg_cv_OPUS_LIBS + OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS + OPUS_LIBS=$pkg_cv_OPUS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBopus=libopus_plugin.la + LTLIBopus=libopus_plugin.la @@ -46355,14 +46296,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` + OPUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` else - OPUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` + OPUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg opus >= 1.0.3" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OPUS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OPUS_PKG_ERRORS" >&5 - enable_opus=no + enable_opus=no if test x"$enable_opus" = "xyes" then : as_fn_error $? "Library ogg opus >= 1.0.3 needed for opus was not found" "$LINENO" 5 @@ -46374,7 +46315,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_opus=no + enable_opus=no if test x"$enable_opus" = "xyes" then : as_fn_error $? "Library ogg opus >= 1.0.3 needed for opus was not found" "$LINENO" 5 @@ -46384,11 +46325,11 @@ fi else - OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS - OPUS_LIBS=$pkg_cv_OPUS_LIBS + OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS + OPUS_LIBS=$pkg_cv_OPUS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_opus=yes + enable_opus=yes LTLIBopus=libopus_plugin.la @@ -46503,14 +46444,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spatialaudio" 2>&1` + SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spatialaudio" 2>&1` else - SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spatialaudio" 2>&1` + SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spatialaudio" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SPATIALAUDIO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SPATIALAUDIO_PKG_ERRORS" >&5 - if test x"$enable_spatialaudio" = "xyes" + if test x"$enable_spatialaudio" = "xyes" then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 else $as_nop @@ -46521,7 +46462,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_spatialaudio" = "xyes" + if test x"$enable_spatialaudio" = "xyes" then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 else $as_nop @@ -46530,11 +46471,11 @@ fi else - SPATIALAUDIO_CFLAGS=$pkg_cv_SPATIALAUDIO_CFLAGS - SPATIALAUDIO_LIBS=$pkg_cv_SPATIALAUDIO_LIBS + SPATIALAUDIO_CFLAGS=$pkg_cv_SPATIALAUDIO_CFLAGS + SPATIALAUDIO_LIBS=$pkg_cv_SPATIALAUDIO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBspatialaudio=libspatialaudio_plugin.la + LTLIBspatialaudio=libspatialaudio_plugin.la @@ -46605,14 +46546,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spatialaudio" 2>&1` + SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spatialaudio" 2>&1` else - SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spatialaudio" 2>&1` + SPATIALAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spatialaudio" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SPATIALAUDIO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SPATIALAUDIO_PKG_ERRORS" >&5 - enable_spatialaudio=no + enable_spatialaudio=no if test x"$enable_spatialaudio" = "xyes" then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 @@ -46624,7 +46565,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_spatialaudio=no + enable_spatialaudio=no if test x"$enable_spatialaudio" = "xyes" then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 @@ -46634,11 +46575,11 @@ fi else - SPATIALAUDIO_CFLAGS=$pkg_cv_SPATIALAUDIO_CFLAGS - SPATIALAUDIO_LIBS=$pkg_cv_SPATIALAUDIO_LIBS + SPATIALAUDIO_CFLAGS=$pkg_cv_SPATIALAUDIO_CFLAGS + SPATIALAUDIO_LIBS=$pkg_cv_SPATIALAUDIO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_spatialaudio=yes + enable_spatialaudio=yes LTLIBspatialaudio=libspatialaudio_plugin.la @@ -46753,14 +46694,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` + THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` else - THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` + THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$THEORA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$THEORA_PKG_ERRORS" >&5 - if test x"$enable_theora" = "xyes" + if test x"$enable_theora" = "xyes" then : as_fn_error $? "Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" "$LINENO" 5 else $as_nop @@ -46771,7 +46712,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_theora" = "xyes" + if test x"$enable_theora" = "xyes" then : as_fn_error $? "Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" "$LINENO" 5 else $as_nop @@ -46780,11 +46721,11 @@ fi else - THEORA_CFLAGS=$pkg_cv_THEORA_CFLAGS - THEORA_LIBS=$pkg_cv_THEORA_LIBS + THEORA_CFLAGS=$pkg_cv_THEORA_CFLAGS + THEORA_LIBS=$pkg_cv_THEORA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBtheora=libtheora_plugin.la + LTLIBtheora=libtheora_plugin.la @@ -46855,14 +46796,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` + THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` else - THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` + THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg theoradec >= 1.0 theoraenc" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$THEORA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$THEORA_PKG_ERRORS" >&5 - enable_theora=no + enable_theora=no if test x"$enable_theora" = "xyes" then : as_fn_error $? "Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" "$LINENO" 5 @@ -46874,7 +46815,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_theora=no + enable_theora=no if test x"$enable_theora" = "xyes" then : as_fn_error $? "Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" "$LINENO" 5 @@ -46884,11 +46825,11 @@ fi else - THEORA_CFLAGS=$pkg_cv_THEORA_CFLAGS - THEORA_LIBS=$pkg_cv_THEORA_LIBS + THEORA_CFLAGS=$pkg_cv_THEORA_CFLAGS + THEORA_LIBS=$pkg_cv_THEORA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_theora=yes + enable_theora=yes LTLIBtheora=libtheora_plugin.la @@ -47003,14 +46944,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg" 2>&1` + OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg" 2>&1` else - OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg" 2>&1` + OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OGGSPOTS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OGGSPOTS_PKG_ERRORS" >&5 - if test x"$enable_oggspots" = "xyes" + if test x"$enable_oggspots" = "xyes" then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 else $as_nop @@ -47021,7 +46962,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_oggspots" = "xyes" + if test x"$enable_oggspots" = "xyes" then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 else $as_nop @@ -47030,11 +46971,11 @@ fi else - OGGSPOTS_CFLAGS=$pkg_cv_OGGSPOTS_CFLAGS - OGGSPOTS_LIBS=$pkg_cv_OGGSPOTS_LIBS + OGGSPOTS_CFLAGS=$pkg_cv_OGGSPOTS_CFLAGS + OGGSPOTS_LIBS=$pkg_cv_OGGSPOTS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBoggspots=liboggspots_plugin.la + LTLIBoggspots=liboggspots_plugin.la @@ -47105,14 +47046,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg" 2>&1` + OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg" 2>&1` else - OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg" 2>&1` + OGGSPOTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OGGSPOTS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OGGSPOTS_PKG_ERRORS" >&5 - enable_oggspots=no + enable_oggspots=no if test x"$enable_oggspots" = "xyes" then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 @@ -47124,7 +47065,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_oggspots=no + enable_oggspots=no if test x"$enable_oggspots" = "xyes" then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 @@ -47134,11 +47075,11 @@ fi else - OGGSPOTS_CFLAGS=$pkg_cv_OGGSPOTS_CFLAGS - OGGSPOTS_LIBS=$pkg_cv_OGGSPOTS_LIBS + OGGSPOTS_CFLAGS=$pkg_cv_OGGSPOTS_CFLAGS + OGGSPOTS_LIBS=$pkg_cv_OGGSPOTS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_oggspots=yes + enable_oggspots=yes LTLIBoggspots=liboggspots_plugin.la @@ -47253,14 +47194,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DAALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "daaladec daalaenc" 2>&1` + DAALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "daaladec daalaenc" 2>&1` else - DAALA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "daaladec daalaenc" 2>&1` + DAALA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "daaladec daalaenc" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DAALA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DAALA_PKG_ERRORS" >&5 - if test x"$enable_daala" = "xyes" + if test x"$enable_daala" = "xyes" then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 else $as_nop @@ -47271,7 +47212,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_daala" = "xyes" + if test x"$enable_daala" = "xyes" then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 else $as_nop @@ -47280,11 +47221,11 @@ fi else - DAALA_CFLAGS=$pkg_cv_DAALA_CFLAGS - DAALA_LIBS=$pkg_cv_DAALA_LIBS + DAALA_CFLAGS=$pkg_cv_DAALA_CFLAGS + DAALA_LIBS=$pkg_cv_DAALA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBdaala=libdaala_plugin.la + LTLIBdaala=libdaala_plugin.la @@ -47355,14 +47296,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DAALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "daaladec daalaenc" 2>&1` + DAALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "daaladec daalaenc" 2>&1` else - DAALA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "daaladec daalaenc" 2>&1` + DAALA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "daaladec daalaenc" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$DAALA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$DAALA_PKG_ERRORS" >&5 - enable_daala=no + enable_daala=no if test x"$enable_daala" = "xyes" then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 @@ -47374,7 +47315,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_daala=no + enable_daala=no if test x"$enable_daala" = "xyes" then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 @@ -47384,11 +47325,11 @@ fi else - DAALA_CFLAGS=$pkg_cv_DAALA_CFLAGS - DAALA_LIBS=$pkg_cv_DAALA_LIBS + DAALA_CFLAGS=$pkg_cv_DAALA_CFLAGS + DAALA_LIBS=$pkg_cv_DAALA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_daala=yes + enable_daala=yes LTLIBdaala=libdaala_plugin.la @@ -47503,14 +47444,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` + SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` else - SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` + SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SCHROEDINGER_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SCHROEDINGER_PKG_ERRORS" >&5 - if test x"$enable_schroedinger" = "xyes" + if test x"$enable_schroedinger" = "xyes" then : as_fn_error $? "Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" "$LINENO" 5 else $as_nop @@ -47521,7 +47462,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_schroedinger" = "xyes" + if test x"$enable_schroedinger" = "xyes" then : as_fn_error $? "Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" "$LINENO" 5 else $as_nop @@ -47530,11 +47471,11 @@ fi else - SCHROEDINGER_CFLAGS=$pkg_cv_SCHROEDINGER_CFLAGS - SCHROEDINGER_LIBS=$pkg_cv_SCHROEDINGER_LIBS + SCHROEDINGER_CFLAGS=$pkg_cv_SCHROEDINGER_CFLAGS + SCHROEDINGER_LIBS=$pkg_cv_SCHROEDINGER_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBschroedinger=libschroedinger_plugin.la + LTLIBschroedinger=libschroedinger_plugin.la @@ -47605,14 +47546,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` + SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` else - SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` + SCHROEDINGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "schroedinger-1.0 >= 1.0.10" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SCHROEDINGER_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SCHROEDINGER_PKG_ERRORS" >&5 - enable_schroedinger=no + enable_schroedinger=no if test x"$enable_schroedinger" = "xyes" then : as_fn_error $? "Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" "$LINENO" 5 @@ -47624,7 +47565,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_schroedinger=no + enable_schroedinger=no if test x"$enable_schroedinger" = "xyes" then : as_fn_error $? "Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" "$LINENO" 5 @@ -47634,11 +47575,11 @@ fi else - SCHROEDINGER_CFLAGS=$pkg_cv_SCHROEDINGER_CFLAGS - SCHROEDINGER_LIBS=$pkg_cv_SCHROEDINGER_LIBS + SCHROEDINGER_CFLAGS=$pkg_cv_SCHROEDINGER_CFLAGS + SCHROEDINGER_LIBS=$pkg_cv_SCHROEDINGER_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_schroedinger=yes + enable_schroedinger=yes LTLIBschroedinger=libschroedinger_plugin.la @@ -47878,12 +47819,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X262_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x262" 2>&1` + X262_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x262" 2>&1` else - X262_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x262" 2>&1` + X262_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x262" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$X262_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$X262_PKG_ERRORS" >&5 if test "${enable_x262}" = "yes"; then @@ -47899,8 +47840,8 @@ fi else - X262_CFLAGS=$pkg_cv_X262_CFLAGS - X262_LIBS=$pkg_cv_X262_LIBS + X262_CFLAGS=$pkg_cv_X262_CFLAGS + X262_LIBS=$pkg_cv_X262_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -48024,14 +47965,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X265_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x265" 2>&1` + X265_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x265" 2>&1` else - X265_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x265" 2>&1` + X265_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x265" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$X265_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$X265_PKG_ERRORS" >&5 - if test x"$enable_x265" = "xyes" + if test x"$enable_x265" = "xyes" then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 else $as_nop @@ -48042,7 +47983,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_x265" = "xyes" + if test x"$enable_x265" = "xyes" then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 else $as_nop @@ -48051,11 +47992,11 @@ fi else - X265_CFLAGS=$pkg_cv_X265_CFLAGS - X265_LIBS=$pkg_cv_X265_LIBS + X265_CFLAGS=$pkg_cv_X265_CFLAGS + X265_LIBS=$pkg_cv_X265_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBx265=libx265_plugin.la + LTLIBx265=libx265_plugin.la @@ -48126,14 +48067,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X265_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x265" 2>&1` + X265_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x265" 2>&1` else - X265_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x265" 2>&1` + X265_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x265" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$X265_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$X265_PKG_ERRORS" >&5 - enable_x265=no + enable_x265=no if test x"$enable_x265" = "xyes" then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 @@ -48145,7 +48086,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_x265=no + enable_x265=no if test x"$enable_x265" = "xyes" then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 @@ -48155,11 +48096,11 @@ fi else - X265_CFLAGS=$pkg_cv_X265_CFLAGS - X265_LIBS=$pkg_cv_X265_LIBS + X265_CFLAGS=$pkg_cv_X265_CFLAGS + X265_LIBS=$pkg_cv_X265_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_x265=yes + enable_x265=yes LTLIBx265=libx265_plugin.la @@ -48254,12 +48195,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x264 >= 0.148" 2>&1` + X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x264 >= 0.148" 2>&1` else - X264_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x264 >= 0.148" 2>&1` + X264_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x264 >= 0.148" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$X264_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$X264_PKG_ERRORS" >&5 if test "${enable_x264}" = "yes"; then @@ -48275,8 +48216,8 @@ fi else - X264_CFLAGS=$pkg_cv_X264_CFLAGS - X264_LIBS=$pkg_cv_X264_LIBS + X264_CFLAGS=$pkg_cv_X264_CFLAGS + X264_LIBS=$pkg_cv_X264_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -48382,12 +48323,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X26410b_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x264 >= 0.153" 2>&1` + X26410b_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x264 >= 0.153" 2>&1` else - X26410b_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x264 >= 0.153" 2>&1` + X26410b_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x264 >= 0.153" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$X26410b_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$X26410b_PKG_ERRORS" >&5 if test "${enable_x26410b}" = "yes"; then @@ -48403,8 +48344,8 @@ fi else - X26410b_CFLAGS=$pkg_cv_X26410b_CFLAGS - X26410b_LIBS=$pkg_cv_X26410b_LIBS + X26410b_CFLAGS=$pkg_cv_X26410b_CFLAGS + X26410b_LIBS=$pkg_cv_X26410b_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -48531,14 +48472,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MFX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmfx" 2>&1` + MFX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmfx" 2>&1` else - MFX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmfx" 2>&1` + MFX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmfx" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MFX_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MFX_PKG_ERRORS" >&5 - if test x"$enable_mfx" = "xyes" + if test x"$enable_mfx" = "xyes" then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 else $as_nop @@ -48549,7 +48490,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_mfx" = "xyes" + if test x"$enable_mfx" = "xyes" then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 else $as_nop @@ -48558,11 +48499,11 @@ fi else - MFX_CFLAGS=$pkg_cv_MFX_CFLAGS - MFX_LIBS=$pkg_cv_MFX_LIBS + MFX_CFLAGS=$pkg_cv_MFX_CFLAGS + MFX_LIBS=$pkg_cv_MFX_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBqsv=libqsv_plugin.la + LTLIBqsv=libqsv_plugin.la @@ -48633,14 +48574,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MFX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmfx" 2>&1` + MFX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmfx" 2>&1` else - MFX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmfx" 2>&1` + MFX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmfx" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MFX_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MFX_PKG_ERRORS" >&5 - enable_mfx=no + enable_mfx=no if test x"$enable_mfx" = "xyes" then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 @@ -48652,7 +48593,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_mfx=no + enable_mfx=no if test x"$enable_mfx" = "xyes" then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 @@ -48662,11 +48603,11 @@ fi else - MFX_CFLAGS=$pkg_cv_MFX_CFLAGS - MFX_LIBS=$pkg_cv_MFX_LIBS + MFX_CFLAGS=$pkg_cv_MFX_CFLAGS + MFX_LIBS=$pkg_cv_MFX_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_mfx=yes + enable_mfx=yes LTLIBqsv=libqsv_plugin.la @@ -48781,14 +48722,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` + FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` else - FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` + FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FLUIDSYNTH_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FLUIDSYNTH_PKG_ERRORS" >&5 - if test x"$enable_fluidsynth" = "xyes" + if test x"$enable_fluidsynth" = "xyes" then : as_fn_error $? "Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" "$LINENO" 5 else $as_nop @@ -48799,7 +48740,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_fluidsynth" = "xyes" + if test x"$enable_fluidsynth" = "xyes" then : as_fn_error $? "Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" "$LINENO" 5 else $as_nop @@ -48808,11 +48749,11 @@ fi else - FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS - FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS + FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS + FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBfluidsynth=libfluidsynth_plugin.la + LTLIBfluidsynth=libfluidsynth_plugin.la @@ -48883,14 +48824,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` + FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` else - FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` + FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.1.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FLUIDSYNTH_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FLUIDSYNTH_PKG_ERRORS" >&5 - enable_fluidsynth=no + enable_fluidsynth=no if test x"$enable_fluidsynth" = "xyes" then : as_fn_error $? "Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" "$LINENO" 5 @@ -48902,7 +48843,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_fluidsynth=no + enable_fluidsynth=no if test x"$enable_fluidsynth" = "xyes" then : as_fn_error $? "Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" "$LINENO" 5 @@ -48912,11 +48853,11 @@ fi else - FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS - FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS + FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS + FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_fluidsynth=yes + enable_fluidsynth=yes LTLIBfluidsynth=libfluidsynth_plugin.la @@ -49030,14 +48971,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidlite" 2>&1` + FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidlite" 2>&1` else - FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidlite" 2>&1` + FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidlite" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FLUIDLITE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FLUIDLITE_PKG_ERRORS" >&5 - if test x"$enable_fluidlite" = "xyes" + if test x"$enable_fluidlite" = "xyes" then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 else $as_nop @@ -49048,7 +48989,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_fluidlite" = "xyes" + if test x"$enable_fluidlite" = "xyes" then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 else $as_nop @@ -49057,11 +48998,11 @@ fi else - FLUIDLITE_CFLAGS=$pkg_cv_FLUIDLITE_CFLAGS - FLUIDLITE_LIBS=$pkg_cv_FLUIDLITE_LIBS + FLUIDLITE_CFLAGS=$pkg_cv_FLUIDLITE_CFLAGS + FLUIDLITE_LIBS=$pkg_cv_FLUIDLITE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBfluidsynth=libfluidsynth_plugin.la + LTLIBfluidsynth=libfluidsynth_plugin.la @@ -49132,14 +49073,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidlite" 2>&1` + FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidlite" 2>&1` else - FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidlite" 2>&1` + FLUIDLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidlite" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FLUIDLITE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FLUIDLITE_PKG_ERRORS" >&5 - enable_fluidlite=no + enable_fluidlite=no if test x"$enable_fluidlite" = "xyes" then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 @@ -49151,7 +49092,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_fluidlite=no + enable_fluidlite=no if test x"$enable_fluidlite" = "xyes" then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 @@ -49161,11 +49102,11 @@ fi else - FLUIDLITE_CFLAGS=$pkg_cv_FLUIDLITE_CFLAGS - FLUIDLITE_LIBS=$pkg_cv_FLUIDLITE_LIBS + FLUIDLITE_CFLAGS=$pkg_cv_FLUIDLITE_CFLAGS + FLUIDLITE_LIBS=$pkg_cv_FLUIDLITE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_fluidlite=yes + enable_fluidlite=yes LTLIBfluidsynth=libfluidsynth_plugin.la @@ -49280,12 +49221,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ZVBI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` + ZVBI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` else - ZVBI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` + ZVBI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zvbi-0.2 >= 0.2.28" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ZVBI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ZVBI_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&5 @@ -49299,8 +49240,8 @@ printf "%s\n" "$as_me: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&2;} else - ZVBI_CFLAGS=$pkg_cv_ZVBI_CFLAGS - ZVBI_LIBS=$pkg_cv_ZVBI_LIBS + ZVBI_CFLAGS=$pkg_cv_ZVBI_CFLAGS + ZVBI_LIBS=$pkg_cv_ZVBI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -49397,12 +49338,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBASS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libass >= 0.9.8" 2>&1` + LIBASS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libass >= 0.9.8" 2>&1` else - LIBASS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libass >= 0.9.8" 2>&1` + LIBASS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libass >= 0.9.8" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBASS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBASS_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBASS_PKG_ERRORS}." >&5 @@ -49416,8 +49357,8 @@ printf "%s\n" "$as_me: WARNING: ${LIBASS_PKG_ERRORS}." >&2;} else - LIBASS_CFLAGS=$pkg_cv_LIBASS_CFLAGS - LIBASS_LIBS=$pkg_cv_LIBASS_LIBS + LIBASS_CFLAGS=$pkg_cv_LIBASS_CFLAGS + LIBASS_LIBS=$pkg_cv_LIBASS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -49516,12 +49457,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ARIBB24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aribb24 >= 1.0.1" 2>&1` + ARIBB24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aribb24 >= 1.0.1" 2>&1` else - ARIBB24_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aribb24 >= 1.0.1" 2>&1` + ARIBB24_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aribb24 >= 1.0.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ARIBB24_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ARIBB24_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb24 needed for aribsub was not found" >&5 @@ -49537,8 +49478,8 @@ have_aribb24="no" else - ARIBB24_CFLAGS=$pkg_cv_ARIBB24_CFLAGS - ARIBB24_LIBS=$pkg_cv_ARIBB24_LIBS + ARIBB24_CFLAGS=$pkg_cv_ARIBB24_CFLAGS + ARIBB24_LIBS=$pkg_cv_ARIBB24_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -49650,14 +49591,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ARIBB25_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` + ARIBB25_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` else - ARIBB25_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` + ARIBB25_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ARIBB25_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ARIBB25_PKG_ERRORS" >&5 - if test x"$enable_aribb25" = "xyes" + if test x"$enable_aribb25" = "xyes" then : as_fn_error $? "Library aribb25 >= 0.2.6 needed for aribb25 was not found" "$LINENO" 5 else $as_nop @@ -49668,7 +49609,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_aribb25" = "xyes" + if test x"$enable_aribb25" = "xyes" then : as_fn_error $? "Library aribb25 >= 0.2.6 needed for aribb25 was not found" "$LINENO" 5 else $as_nop @@ -49677,11 +49618,11 @@ fi else - ARIBB25_CFLAGS=$pkg_cv_ARIBB25_CFLAGS - ARIBB25_LIBS=$pkg_cv_ARIBB25_LIBS + ARIBB25_CFLAGS=$pkg_cv_ARIBB25_CFLAGS + ARIBB25_LIBS=$pkg_cv_ARIBB25_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBaribcam=libaribcam_plugin.la + LTLIBaribcam=libaribcam_plugin.la @@ -49752,14 +49693,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ARIBB25_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` + ARIBB25_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` else - ARIBB25_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` + ARIBB25_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "aribb25 >= 0.2.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ARIBB25_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ARIBB25_PKG_ERRORS" >&5 - enable_aribb25=no + enable_aribb25=no if test x"$enable_aribb25" = "xyes" then : as_fn_error $? "Library aribb25 >= 0.2.6 needed for aribb25 was not found" "$LINENO" 5 @@ -49771,7 +49712,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_aribb25=no + enable_aribb25=no if test x"$enable_aribb25" = "xyes" then : as_fn_error $? "Library aribb25 >= 0.2.6 needed for aribb25 was not found" "$LINENO" 5 @@ -49781,11 +49722,11 @@ fi else - ARIBB25_CFLAGS=$pkg_cv_ARIBB25_CFLAGS - ARIBB25_LIBS=$pkg_cv_ARIBB25_LIBS + ARIBB25_CFLAGS=$pkg_cv_ARIBB25_CFLAGS + ARIBB25_LIBS=$pkg_cv_ARIBB25_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_aribb25=yes + enable_aribb25=yes LTLIBaribcam=libaribcam_plugin.la @@ -49900,14 +49841,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - KATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` + KATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` else - KATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` + KATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$KATE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$KATE_PKG_ERRORS" >&5 - if test x"$enable_kate" = "xyes" + if test x"$enable_kate" = "xyes" then : as_fn_error $? "Library kate >= 0.3.0 needed for kate was not found" "$LINENO" 5 else $as_nop @@ -49918,7 +49859,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_kate" = "xyes" + if test x"$enable_kate" = "xyes" then : as_fn_error $? "Library kate >= 0.3.0 needed for kate was not found" "$LINENO" 5 else $as_nop @@ -49927,11 +49868,11 @@ fi else - KATE_CFLAGS=$pkg_cv_KATE_CFLAGS - KATE_LIBS=$pkg_cv_KATE_LIBS + KATE_CFLAGS=$pkg_cv_KATE_CFLAGS + KATE_LIBS=$pkg_cv_KATE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBkate=libkate_plugin.la + LTLIBkate=libkate_plugin.la @@ -50002,14 +49943,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - KATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` + KATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` else - KATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` + KATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "kate >= 0.3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$KATE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$KATE_PKG_ERRORS" >&5 - enable_kate=no + enable_kate=no if test x"$enable_kate" = "xyes" then : as_fn_error $? "Library kate >= 0.3.0 needed for kate was not found" "$LINENO" 5 @@ -50021,7 +49962,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_kate=no + enable_kate=no if test x"$enable_kate" = "xyes" then : as_fn_error $? "Library kate >= 0.3.0 needed for kate was not found" "$LINENO" 5 @@ -50031,11 +49972,11 @@ fi else - KATE_CFLAGS=$pkg_cv_KATE_CFLAGS - KATE_LIBS=$pkg_cv_KATE_LIBS + KATE_CFLAGS=$pkg_cv_KATE_CFLAGS + KATE_LIBS=$pkg_cv_KATE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_kate=yes + enable_kate=yes LTLIBkate=libkate_plugin.la @@ -50132,12 +50073,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TIGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tiger >= 0.3.1" 2>&1` + TIGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tiger >= 0.3.1" 2>&1` else - TIGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tiger >= 0.3.1" 2>&1` + TIGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tiger >= 0.3.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$TIGER_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$TIGER_PKG_ERRORS" >&5 if test -n "${enable_tiger}" @@ -50159,8 +50100,8 @@ fi else - TIGER_CFLAGS=$pkg_cv_TIGER_CFLAGS - TIGER_LIBS=$pkg_cv_TIGER_LIBS + TIGER_CFLAGS=$pkg_cv_TIGER_CFLAGS + TIGER_LIBS=$pkg_cv_TIGER_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -50251,12 +50192,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "egl" 2>&1` + EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "egl" 2>&1` else - EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "egl" 2>&1` + EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "egl" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$EGL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$EGL_PKG_ERRORS" >&5 have_egl="no" @@ -50268,8 +50209,8 @@ have_egl="no" else - EGL_CFLAGS=$pkg_cv_EGL_CFLAGS - EGL_LIBS=$pkg_cv_EGL_LIBS + EGL_CFLAGS=$pkg_cv_EGL_CFLAGS + EGL_LIBS=$pkg_cv_EGL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -50338,12 +50279,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gl" 2>&1` + GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gl" 2>&1` else - GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gl" 2>&1` + GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gl" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GL_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenGL" >&5 @@ -50433,8 +50374,8 @@ printf "%s\n" "${have_gl}" >&6; } else - GL_CFLAGS=$pkg_cv_GL_CFLAGS - GL_LIBS=$pkg_cv_GL_LIBS + GL_CFLAGS=$pkg_cv_GL_CFLAGS + GL_LIBS=$pkg_cv_GL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -50537,14 +50478,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLES2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glesv2" 2>&1` + GLES2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glesv2" 2>&1` else - GLES2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glesv2" 2>&1` + GLES2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glesv2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GLES2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GLES2_PKG_ERRORS" >&5 - if test x"$enable_gles2" = "xyes" + if test x"$enable_gles2" = "xyes" then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 else $as_nop @@ -50555,7 +50496,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_gles2" = "xyes" + if test x"$enable_gles2" = "xyes" then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 else $as_nop @@ -50564,11 +50505,11 @@ fi else - GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS - GLES2_LIBS=$pkg_cv_GLES2_LIBS + GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS + GLES2_LIBS=$pkg_cv_GLES2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBgles2=libgles2_plugin.la + LTLIBgles2=libgles2_plugin.la @@ -50639,14 +50580,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLES2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glesv2" 2>&1` + GLES2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glesv2" 2>&1` else - GLES2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glesv2" 2>&1` + GLES2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glesv2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GLES2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GLES2_PKG_ERRORS" >&5 - enable_gles2=no + enable_gles2=no if test x"$enable_gles2" = "xyes" then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 @@ -50658,7 +50599,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_gles2=no + enable_gles2=no if test x"$enable_gles2" = "xyes" then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 @@ -50668,11 +50609,11 @@ fi else - GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS - GLES2_LIBS=$pkg_cv_GLES2_LIBS + GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS + GLES2_LIBS=$pkg_cv_GLES2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_gles2=yes + enable_gles2=yes LTLIBgles2=libgles2_plugin.la @@ -51529,14 +51470,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb >= 1.6" 2>&1` + XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb >= 1.6" 2>&1` else - XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb >= 1.6" 2>&1` + XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb >= 1.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XCB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XCB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xcb >= 1.6) were not met: + as_fn_error $? "Package requirements (xcb >= 1.6) were not met: $XCB_PKG_ERRORS @@ -51549,7 +51490,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -51562,8 +51503,8 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - XCB_CFLAGS=$pkg_cv_XCB_CFLAGS - XCB_LIBS=$pkg_cv_XCB_LIBS + XCB_CFLAGS=$pkg_cv_XCB_CFLAGS + XCB_LIBS=$pkg_cv_XCB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -51621,14 +51562,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-shm" 2>&1` + XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-shm" 2>&1` else - XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-shm" 2>&1` + XCB_SHM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-shm" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XCB_SHM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XCB_SHM_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xcb-shm) were not met: + as_fn_error $? "Package requirements (xcb-shm) were not met: $XCB_SHM_PKG_ERRORS @@ -51641,7 +51582,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -51654,8 +51595,8 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - XCB_SHM_CFLAGS=$pkg_cv_XCB_SHM_CFLAGS - XCB_SHM_LIBS=$pkg_cv_XCB_SHM_LIBS + XCB_SHM_CFLAGS=$pkg_cv_XCB_SHM_CFLAGS + XCB_SHM_LIBS=$pkg_cv_XCB_SHM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -51712,14 +51653,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-composite" 2>&1` + XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-composite" 2>&1` else - XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-composite" 2>&1` + XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-composite" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XCB_COMPOSITE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XCB_COMPOSITE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xcb-composite) were not met: + as_fn_error $? "Package requirements (xcb-composite) were not met: $XCB_COMPOSITE_PKG_ERRORS @@ -51732,7 +51673,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -51745,8 +51686,8 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - XCB_COMPOSITE_CFLAGS=$pkg_cv_XCB_COMPOSITE_CFLAGS - XCB_COMPOSITE_LIBS=$pkg_cv_XCB_COMPOSITE_LIBS + XCB_COMPOSITE_CFLAGS=$pkg_cv_XCB_COMPOSITE_CFLAGS + XCB_COMPOSITE_LIBS=$pkg_cv_XCB_COMPOSITE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -51803,14 +51744,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xproto" 2>&1` + XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xproto" 2>&1` else - XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xproto" 2>&1` + XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xproto" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XPROTO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XPROTO_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xproto) were not met: + as_fn_error $? "Package requirements (xproto) were not met: $XPROTO_PKG_ERRORS @@ -51823,7 +51764,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -51836,8 +51777,8 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - XPROTO_CFLAGS=$pkg_cv_XPROTO_CFLAGS - XPROTO_LIBS=$pkg_cv_XPROTO_LIBS + XPROTO_CFLAGS=$pkg_cv_XPROTO_CFLAGS + XPROTO_LIBS=$pkg_cv_XPROTO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -51898,14 +51839,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-xv >= 1.1.90.1" 2>&1` + XCB_XV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-xv >= 1.1.90.1" 2>&1` else - XCB_XV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-xv >= 1.1.90.1" 2>&1` + XCB_XV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-xv >= 1.1.90.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XCB_XV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XCB_XV_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xcb-xv >= 1.1.90.1) were not met: + as_fn_error $? "Package requirements (xcb-xv >= 1.1.90.1) were not met: $XCB_XV_PKG_ERRORS @@ -51918,7 +51859,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -51931,11 +51872,11 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - XCB_XV_CFLAGS=$pkg_cv_XCB_XV_CFLAGS - XCB_XV_LIBS=$pkg_cv_XCB_XV_LIBS + XCB_XV_CFLAGS=$pkg_cv_XCB_XV_CFLAGS + XCB_XV_LIBS=$pkg_cv_XCB_XV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_xcb_xvideo="yes" + have_xcb_xvideo="yes" fi fi @@ -51992,14 +51933,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-randr >= 1.3" 2>&1` + XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-randr >= 1.3" 2>&1` else - XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-randr >= 1.3" 2>&1` + XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-randr >= 1.3" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XCB_RANDR_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XCB_RANDR_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xcb-randr >= 1.3) were not met: + as_fn_error $? "Package requirements (xcb-randr >= 1.3) were not met: $XCB_RANDR_PKG_ERRORS @@ -52012,7 +51953,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -52025,11 +51966,11 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS - XCB_RANDR_LIBS=$pkg_cv_XCB_RANDR_LIBS + XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS + XCB_RANDR_LIBS=$pkg_cv_XCB_RANDR_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_xcb_randr="yes" + have_xcb_randr="yes" fi @@ -52084,12 +52025,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-keysyms >= 0.3.4" 2>&1` + XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-keysyms >= 0.3.4" 2>&1` else - XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-keysyms >= 0.3.4" 2>&1` + XCB_KEYSYMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-keysyms >= 0.3.4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XCB_KEYSYMS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XCB_KEYSYMS_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&5 @@ -52103,11 +52044,11 @@ printf "%s\n" "$as_me: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&2;} else - XCB_KEYSYMS_CFLAGS=$pkg_cv_XCB_KEYSYMS_CFLAGS - XCB_KEYSYMS_LIBS=$pkg_cv_XCB_KEYSYMS_LIBS + XCB_KEYSYMS_CFLAGS=$pkg_cv_XCB_KEYSYMS_CFLAGS + XCB_KEYSYMS_LIBS=$pkg_cv_XCB_KEYSYMS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_xcb_keysyms="yes" + have_xcb_keysyms="yes" fi fi @@ -52207,12 +52148,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VDPAU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vdpau >= 0.6" 2>&1` + VDPAU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vdpau >= 0.6" 2>&1` else - VDPAU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vdpau >= 0.6" 2>&1` + VDPAU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vdpau >= 0.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VDPAU_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VDPAU_PKG_ERRORS" >&5 if test -n "${enable_vdpau}" @@ -52234,8 +52175,8 @@ fi else - VDPAU_CFLAGS=$pkg_cv_VDPAU_CFLAGS - VDPAU_LIBS=$pkg_cv_VDPAU_LIBS + VDPAU_CFLAGS=$pkg_cv_VDPAU_CFLAGS + VDPAU_LIBS=$pkg_cv_VDPAU_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -52369,12 +52310,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WAYLAND_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-client >= 1.5.91" 2>&1` + WAYLAND_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-client >= 1.5.91" 2>&1` else - WAYLAND_CLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-client >= 1.5.91" 2>&1` + WAYLAND_CLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-client >= 1.5.91" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$WAYLAND_CLIENT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$WAYLAND_CLIENT_PKG_ERRORS" >&5 if test -n "${enable_wayland}" @@ -52396,8 +52337,8 @@ fi else - WAYLAND_CLIENT_CFLAGS=$pkg_cv_WAYLAND_CLIENT_CFLAGS - WAYLAND_CLIENT_LIBS=$pkg_cv_WAYLAND_CLIENT_LIBS + WAYLAND_CLIENT_CFLAGS=$pkg_cv_WAYLAND_CLIENT_CFLAGS + WAYLAND_CLIENT_LIBS=$pkg_cv_WAYLAND_CLIENT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -52500,12 +52441,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-egl" 2>&1` + WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-egl" 2>&1` else - WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-egl" 2>&1` + WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-egl" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$WAYLAND_EGL_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$WAYLAND_EGL_PKG_ERRORS" >&5 as_fn_error $? "${WAYLAND_EGL_PKG_ERRORS}." "$LINENO" 5 @@ -52517,8 +52458,8 @@ as_fn_error $? "${WAYLAND_EGL_PKG_ERRORS}." "$LINENO" 5 else - WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS - WAYLAND_EGL_LIBS=$pkg_cv_WAYLAND_EGL_LIBS + WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS + WAYLAND_EGL_LIBS=$pkg_cv_WAYLAND_EGL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -52612,12 +52553,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "SDL_image >= 1.2.10" 2>&1` + SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "SDL_image >= 1.2.10" 2>&1` else - SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "SDL_image >= 1.2.10" 2>&1` + SDL_IMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "SDL_image >= 1.2.10" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SDL_IMAGE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SDL_IMAGE_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&5 @@ -52631,8 +52572,8 @@ printf "%s\n" "$as_me: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&2;} else - SDL_IMAGE_CFLAGS=$pkg_cv_SDL_IMAGE_CFLAGS - SDL_IMAGE_LIBS=$pkg_cv_SDL_IMAGE_LIBS + SDL_IMAGE_CFLAGS=$pkg_cv_SDL_IMAGE_CFLAGS + SDL_IMAGE_LIBS=$pkg_cv_SDL_IMAGE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -52768,12 +52709,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2" 2>&1` + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2" 2>&1` else - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2" 2>&1` + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FREETYPE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FREETYPE_PKG_ERRORS" >&5 if test -n "${enable_freetype}" @@ -52795,8 +52736,8 @@ fi else - FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS - FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS + FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS + FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -52869,12 +52810,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig >= 2.11" 2>&1` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig >= 2.11" 2>&1` else - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig >= 2.11" 2>&1` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig >= 2.11" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FONTCONFIG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FONTCONFIG_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&5 @@ -52888,8 +52829,8 @@ printf "%s\n" "$as_me: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&2;} else - FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS - FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS + FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS + FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -52952,23 +52893,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fribidi" 2>&1` + FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fribidi" 2>&1` else - FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fribidi" 2>&1` + FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fribidi" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$FRIBIDI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$FRIBIDI_PKG_ERRORS" >&5 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 printf "%s\n" "$as_me: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 printf "%s\n" "$as_me: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} else - FRIBIDI_CFLAGS=$pkg_cv_FRIBIDI_CFLAGS - FRIBIDI_LIBS=$pkg_cv_FRIBIDI_LIBS + FRIBIDI_CFLAGS=$pkg_cv_FRIBIDI_CFLAGS + FRIBIDI_LIBS=$pkg_cv_FRIBIDI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -53043,23 +52984,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz" 2>&1` + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz" 2>&1` else - HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz" 2>&1` + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$HARFBUZZ_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$HARFBUZZ_PKG_ERRORS" >&5 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 printf "%s\n" "$as_me: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 printf "%s\n" "$as_me: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} else - HARFBUZZ_CFLAGS=$pkg_cv_HARFBUZZ_CFLAGS - HARFBUZZ_LIBS=$pkg_cv_HARFBUZZ_LIBS + HARFBUZZ_CFLAGS=$pkg_cv_HARFBUZZ_CFLAGS + HARFBUZZ_LIBS=$pkg_cv_HARFBUZZ_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -53234,14 +53175,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` + SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` else - SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` + SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SVG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SVG_PKG_ERRORS" >&5 - if test x"$enable_svg" = "xyes" + if test x"$enable_svg" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5 else $as_nop @@ -53252,7 +53193,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_svg" = "xyes" + if test x"$enable_svg" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5 else $as_nop @@ -53261,11 +53202,11 @@ fi else - SVG_CFLAGS=$pkg_cv_SVG_CFLAGS - SVG_LIBS=$pkg_cv_SVG_LIBS + SVG_CFLAGS=$pkg_cv_SVG_CFLAGS + SVG_LIBS=$pkg_cv_SVG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsvg=libsvg_plugin.la + LTLIBsvg=libsvg_plugin.la @@ -53336,14 +53277,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` + SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` else - SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` + SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SVG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SVG_PKG_ERRORS" >&5 - enable_svg=no + enable_svg=no if test x"$enable_svg" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5 @@ -53355,7 +53296,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_svg=no + enable_svg=no if test x"$enable_svg" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 needed for svg was not found" "$LINENO" 5 @@ -53365,11 +53306,11 @@ fi else - SVG_CFLAGS=$pkg_cv_SVG_CFLAGS - SVG_LIBS=$pkg_cv_SVG_LIBS + SVG_CFLAGS=$pkg_cv_SVG_CFLAGS + SVG_LIBS=$pkg_cv_SVG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_svg=yes + enable_svg=yes LTLIBsvg=libsvg_plugin.la @@ -53483,14 +53424,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SVGDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` + SVGDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` else - SVGDEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` + SVGDEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SVGDEC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SVGDEC_PKG_ERRORS" >&5 - if test x"$enable_svgdec" = "xyes" + if test x"$enable_svgdec" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" "$LINENO" 5 else $as_nop @@ -53501,7 +53442,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_svgdec" = "xyes" + if test x"$enable_svgdec" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" "$LINENO" 5 else $as_nop @@ -53510,11 +53451,11 @@ fi else - SVGDEC_CFLAGS=$pkg_cv_SVGDEC_CFLAGS - SVGDEC_LIBS=$pkg_cv_SVGDEC_LIBS + SVGDEC_CFLAGS=$pkg_cv_SVGDEC_CFLAGS + SVGDEC_LIBS=$pkg_cv_SVGDEC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsvgdec=libsvgdec_plugin.la + LTLIBsvgdec=libsvgdec_plugin.la @@ -53585,14 +53526,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SVGDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` + SVGDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` else - SVGDEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` + SVGDEC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SVGDEC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SVGDEC_PKG_ERRORS" >&5 - enable_svgdec=no + enable_svgdec=no if test x"$enable_svgdec" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" "$LINENO" 5 @@ -53604,7 +53545,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_svgdec=no + enable_svgdec=no if test x"$enable_svgdec" = "xyes" then : as_fn_error $? "Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" "$LINENO" 5 @@ -53614,11 +53555,11 @@ fi else - SVGDEC_CFLAGS=$pkg_cv_SVGDEC_CFLAGS - SVGDEC_LIBS=$pkg_cv_SVGDEC_LIBS + SVGDEC_CFLAGS=$pkg_cv_SVGDEC_CFLAGS + SVGDEC_LIBS=$pkg_cv_SVGDEC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_svgdec=yes + enable_svgdec=yes LTLIBsvgdec=libsvgdec_plugin.la @@ -53924,14 +53865,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` + CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` else - CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` + CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CACA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CACA_PKG_ERRORS" >&5 - if test x"$enable_caca" = "xyes" + if test x"$enable_caca" = "xyes" then : as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5 else $as_nop @@ -53942,7 +53883,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_caca" = "xyes" + if test x"$enable_caca" = "xyes" then : as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5 else $as_nop @@ -53951,11 +53892,11 @@ fi else - CACA_CFLAGS=$pkg_cv_CACA_CFLAGS - CACA_LIBS=$pkg_cv_CACA_LIBS + CACA_CFLAGS=$pkg_cv_CACA_CFLAGS + CACA_LIBS=$pkg_cv_CACA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBcaca=libcaca_plugin.la + LTLIBcaca=libcaca_plugin.la @@ -54026,14 +53967,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` + CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` else - CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` + CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "caca >= 0.99.beta14" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CACA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CACA_PKG_ERRORS" >&5 - enable_caca=no + enable_caca=no if test x"$enable_caca" = "xyes" then : as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5 @@ -54045,7 +53986,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_caca=no + enable_caca=no if test x"$enable_caca" = "xyes" then : as_fn_error $? "Library caca >= 0.99.beta14 needed for caca was not found" "$LINENO" 5 @@ -54055,11 +53996,11 @@ fi else - CACA_CFLAGS=$pkg_cv_CACA_CFLAGS - CACA_LIBS=$pkg_cv_CACA_LIBS + CACA_CFLAGS=$pkg_cv_CACA_CFLAGS + CACA_LIBS=$pkg_cv_CACA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_caca=yes + enable_caca=yes LTLIBcaca=libcaca_plugin.la @@ -54368,12 +54309,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evas >= 1.15.99 ecore >= 1.15.99" 2>&1` + EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evas >= 1.15.99 ecore >= 1.15.99" 2>&1` else - EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evas >= 1.15.99 ecore >= 1.15.99" 2>&1` + EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evas >= 1.15.99 ecore >= 1.15.99" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$EVAS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$EVAS_PKG_ERRORS" >&5 if test "x${enable_evas}" != "x" @@ -54395,8 +54336,8 @@ fi else - EVAS_CFLAGS=$pkg_cv_EVAS_CFLAGS - EVAS_LIBS=$pkg_cv_EVAS_LIBS + EVAS_CFLAGS=$pkg_cv_EVAS_CFLAGS + EVAS_LIBS=$pkg_cv_EVAS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -54482,12 +54423,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 1.0" 2>&1` + PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 1.0" 2>&1` else - PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 1.0" 2>&1` + PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$PULSE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$PULSE_PKG_ERRORS" >&5 if test "x${enable_pulse}" != "x" @@ -54509,8 +54450,8 @@ fi else - PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS - PULSE_LIBS=$pkg_cv_PULSE_LIBS + PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS + PULSE_LIBS=$pkg_cv_PULSE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -54599,12 +54540,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.24" 2>&1` + ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.24" 2>&1` else - ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.24" 2>&1` + ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.24" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$ALSA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$ALSA_PKG_ERRORS" >&5 if test "x${enable_alsa}" != "x" @@ -54626,8 +54567,8 @@ fi else - ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS - ALSA_LIBS=$pkg_cv_ALSA_LIBS + ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS + ALSA_LIBS=$pkg_cv_ALSA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -54802,12 +54743,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SNDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndio" 2>&1` + SNDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndio" 2>&1` else - SNDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndio" 2>&1` + SNDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndio" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SNDIO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SNDIO_PKG_ERRORS" >&5 if test -n "$enable_sndio" @@ -54829,8 +54770,8 @@ fi else - SNDIO_CFLAGS=$pkg_cv_SNDIO_CFLAGS - SNDIO_LIBS=$pkg_cv_SNDIO_LIBS + SNDIO_CFLAGS=$pkg_cv_SNDIO_CFLAGS + SNDIO_LIBS=$pkg_cv_SNDIO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -54948,12 +54889,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 1.9.7" 2>&1` + JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 1.9.7" 2>&1` else - JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 1.9.7" 2>&1` + JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 1.9.7" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$JACK_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$JACK_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&5 @@ -55011,12 +54952,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` + JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` else - JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` + JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$JACK_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$JACK_PKG_ERRORS" >&5 if test -n "${enable_jack}" @@ -55040,11 +54981,11 @@ fi else - JACK_CFLAGS=$pkg_cv_JACK_CFLAGS - JACK_LIBS=$pkg_cv_JACK_LIBS + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_jack=yes + have_jack=yes fi elif test $pkg_failed = untried; then @@ -55106,12 +55047,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` + JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` else - JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` + JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$JACK_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$JACK_PKG_ERRORS" >&5 if test -n "${enable_jack}" @@ -55135,19 +55076,19 @@ fi else - JACK_CFLAGS=$pkg_cv_JACK_CFLAGS - JACK_LIBS=$pkg_cv_JACK_LIBS + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_jack=yes + have_jack=yes fi else - JACK_CFLAGS=$pkg_cv_JACK_CFLAGS - JACK_LIBS=$pkg_cv_JACK_LIBS + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_jack=yes + have_jack=yes fi fi @@ -55302,14 +55243,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1` + SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1` else - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1` + SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SAMPLERATE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SAMPLERATE_PKG_ERRORS" >&5 - if test x"$enable_samplerate" = "xyes" + if test x"$enable_samplerate" = "xyes" then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 else $as_nop @@ -55320,7 +55261,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_samplerate" = "xyes" + if test x"$enable_samplerate" = "xyes" then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 else $as_nop @@ -55329,11 +55270,11 @@ fi else - SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS - SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS + SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS + SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsamplerate=libsamplerate_plugin.la + LTLIBsamplerate=libsamplerate_plugin.la @@ -55404,14 +55345,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1` + SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1` else - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1` + SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SAMPLERATE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SAMPLERATE_PKG_ERRORS" >&5 - enable_samplerate=no + enable_samplerate=no if test x"$enable_samplerate" = "xyes" then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 @@ -55423,7 +55364,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_samplerate=no + enable_samplerate=no if test x"$enable_samplerate" = "xyes" then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 @@ -55433,11 +55374,11 @@ fi else - SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS - SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS + SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS + SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_samplerate=yes + enable_samplerate=yes LTLIBsamplerate=libsamplerate_plugin.la @@ -55552,14 +55493,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` + SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` else - SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` + SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SOXR_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SOXR_PKG_ERRORS" >&5 - if test x"$enable_soxr" = "xyes" + if test x"$enable_soxr" = "xyes" then : as_fn_error $? "Library soxr >= 0.1.2 needed for soxr was not found" "$LINENO" 5 else $as_nop @@ -55570,7 +55511,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_soxr" = "xyes" + if test x"$enable_soxr" = "xyes" then : as_fn_error $? "Library soxr >= 0.1.2 needed for soxr was not found" "$LINENO" 5 else $as_nop @@ -55579,11 +55520,11 @@ fi else - SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS - SOXR_LIBS=$pkg_cv_SOXR_LIBS + SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS + SOXR_LIBS=$pkg_cv_SOXR_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsoxr=libsoxr_plugin.la + LTLIBsoxr=libsoxr_plugin.la @@ -55654,14 +55595,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` + SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` else - SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` + SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr >= 0.1.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SOXR_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SOXR_PKG_ERRORS" >&5 - enable_soxr=no + enable_soxr=no if test x"$enable_soxr" = "xyes" then : as_fn_error $? "Library soxr >= 0.1.2 needed for soxr was not found" "$LINENO" 5 @@ -55673,7 +55614,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_soxr=no + enable_soxr=no if test x"$enable_soxr" = "xyes" then : as_fn_error $? "Library soxr >= 0.1.2 needed for soxr was not found" "$LINENO" 5 @@ -55683,11 +55624,11 @@ fi else - SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS - SOXR_LIBS=$pkg_cv_SOXR_LIBS + SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS + SOXR_LIBS=$pkg_cv_SOXR_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_soxr=yes + enable_soxr=yes LTLIBsoxr=libsoxr_plugin.la @@ -55882,14 +55823,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` + CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` else - CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` + CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CHROMAPRINT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CHROMAPRINT_PKG_ERRORS" >&5 - if test "${enable_chromaprint}" = "yes" + if test "${enable_chromaprint}" = "yes" then : as_fn_error $? "Library libchromaprint >= 0.6.0 needed for chromaprint was not found" "$LINENO" 5 else $as_nop @@ -55900,7 +55841,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test "${enable_chromaprint}" = "yes" + if test "${enable_chromaprint}" = "yes" then : as_fn_error $? "Library libchromaprint >= 0.6.0 needed for chromaprint was not found" "$LINENO" 5 else $as_nop @@ -55909,11 +55850,11 @@ fi else - CHROMAPRINT_CFLAGS=$pkg_cv_CHROMAPRINT_CFLAGS - CHROMAPRINT_LIBS=$pkg_cv_CHROMAPRINT_LIBS + CHROMAPRINT_CFLAGS=$pkg_cv_CHROMAPRINT_CFLAGS + CHROMAPRINT_LIBS=$pkg_cv_CHROMAPRINT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBstream_out_chromaprint=libstream_out_chromaprint_plugin.la + LTLIBstream_out_chromaprint=libstream_out_chromaprint_plugin.la @@ -55971,14 +55912,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` + CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` else - CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` + CHROMAPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libchromaprint >= 0.6.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CHROMAPRINT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CHROMAPRINT_PKG_ERRORS" >&5 - enable_chromaprint=no + enable_chromaprint=no if test "${enable_chromaprint}" = "yes" then : as_fn_error $? "Library libchromaprint >= 0.6.0 needed for chromaprint was not found" "$LINENO" 5 @@ -55990,7 +55931,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_chromaprint=no + enable_chromaprint=no if test "${enable_chromaprint}" = "yes" then : as_fn_error $? "Library libchromaprint >= 0.6.0 needed for chromaprint was not found" "$LINENO" 5 @@ -56000,11 +55941,11 @@ fi else - CHROMAPRINT_CFLAGS=$pkg_cv_CHROMAPRINT_CFLAGS - CHROMAPRINT_LIBS=$pkg_cv_CHROMAPRINT_LIBS + CHROMAPRINT_CFLAGS=$pkg_cv_CHROMAPRINT_CFLAGS + CHROMAPRINT_LIBS=$pkg_cv_CHROMAPRINT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_chromaprint=yes + enable_chromaprint=yes LTLIBstream_out_chromaprint=libstream_out_chromaprint_plugin.la @@ -56148,14 +56089,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` + CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` else - CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` + CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CHROMECAST_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CHROMECAST_PKG_ERRORS" >&5 - if test "${enable_chromecast}" = "yes" + if test "${enable_chromecast}" = "yes" then : as_fn_error $? "Library protobuf-lite >= 2.5.0 needed for chromecast was not found" "$LINENO" 5 else $as_nop @@ -56168,7 +56109,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test "${enable_chromecast}" = "yes" + if test "${enable_chromecast}" = "yes" then : as_fn_error $? "Library protobuf-lite >= 2.5.0 needed for chromecast was not found" "$LINENO" 5 else $as_nop @@ -56179,11 +56120,11 @@ enable_chromecast="no" else - CHROMECAST_CFLAGS=$pkg_cv_CHROMECAST_CFLAGS - CHROMECAST_LIBS=$pkg_cv_CHROMECAST_LIBS + CHROMECAST_CFLAGS=$pkg_cv_CHROMECAST_CFLAGS + CHROMECAST_LIBS=$pkg_cv_CHROMECAST_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - if test "x${PROTOC}" != "xno" + if test "x${PROTOC}" != "xno" then : build_chromecast="yes" @@ -56248,14 +56189,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` + CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` else - CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` + CHROMECAST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf-lite >= 2.5.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CHROMECAST_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CHROMECAST_PKG_ERRORS" >&5 - enable_chromecast=no + enable_chromecast=no if test "${enable_chromecast}" = "yes" then : @@ -56270,7 +56211,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_chromecast=no + enable_chromecast=no if test "${enable_chromecast}" = "yes" then : @@ -56283,11 +56224,11 @@ enable_chromecast="no" else - CHROMECAST_CFLAGS=$pkg_cv_CHROMECAST_CFLAGS - CHROMECAST_LIBS=$pkg_cv_CHROMECAST_LIBS + CHROMECAST_CFLAGS=$pkg_cv_CHROMECAST_CFLAGS + CHROMECAST_LIBS=$pkg_cv_CHROMECAST_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_chromecast=yes + enable_chromecast=yes if test "x${PROTOC}" != "xno" then : @@ -56394,12 +56335,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" 2>&1` + QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" 2>&1` else - QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" 2>&1` + QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QT_PKG_ERRORS" >&5 if test -n "${enable_qt}" @@ -56433,8 +56374,8 @@ enable_qt="no" else - QT_CFLAGS=$pkg_cv_QT_CFLAGS - QT_LIBS=$pkg_cv_QT_LIBS + QT_CFLAGS=$pkg_cv_QT_CFLAGS + QT_LIBS=$pkg_cv_QT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -56490,12 +56431,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT5_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5X11Extras" 2>&1` + QT5_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5X11Extras" 2>&1` else - QT5_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5X11Extras" 2>&1` + QT5_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5X11Extras" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$QT5_X11_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$QT5_X11_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Not building Qt Interface with X11 helpers." >&5 @@ -56509,8 +56450,8 @@ printf "%s\n" "$as_me: WARNING: Not building Qt Interface with X11 helpers." >&2;} else - QT5_X11_CFLAGS=$pkg_cv_QT5_X11_CFLAGS - QT5_X11_LIBS=$pkg_cv_QT5_X11_LIBS + QT5_X11_CFLAGS=$pkg_cv_QT5_X11_CFLAGS + QT5_X11_LIBS=$pkg_cv_QT5_X11_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -56819,21 +56760,21 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xpm" 2>&1` + XPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xpm" 2>&1` else - XPM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xpm" 2>&1` + XPM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xpm" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XPM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XPM_PKG_ERRORS" >&5 - have_skins_deps="no" + have_skins_deps="no" elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_skins_deps="no" + have_skins_deps="no" else - XPM_CFLAGS=$pkg_cv_XPM_CFLAGS - XPM_LIBS=$pkg_cv_XPM_LIBS + XPM_CFLAGS=$pkg_cv_XPM_CFLAGS + XPM_LIBS=$pkg_cv_XPM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -56890,21 +56831,21 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xinerama" 2>&1` + XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xinerama" 2>&1` else - XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xinerama" 2>&1` + XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xinerama" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XINERAMA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XINERAMA_PKG_ERRORS" >&5 - have_skins_deps="no" + have_skins_deps="no" elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_skins_deps="no" + have_skins_deps="no" else - XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS - XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS + XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS + XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -56961,21 +56902,21 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xext" 2>&1` + XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xext" 2>&1` else - XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xext" 2>&1` + XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xext" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$XEXT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$XEXT_PKG_ERRORS" >&5 - have_skins_deps="no" + have_skins_deps="no" elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_skins_deps="no" + have_skins_deps="no" else - XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS - XEXT_LIBS=$pkg_cv_XEXT_LIBS + XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS + XEXT_LIBS=$pkg_cv_XEXT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -57325,12 +57266,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BREAKPAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "breakpad-client" 2>&1` + BREAKPAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "breakpad-client" 2>&1` else - BREAKPAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "breakpad-client" 2>&1` + BREAKPAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "breakpad-client" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$BREAKPAD_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$BREAKPAD_PKG_ERRORS" >&5 as_fn_error $? "\"breakpad not found\"" "$LINENO" 5 @@ -57342,8 +57283,8 @@ as_fn_error $? "\"breakpad not found\"" "$LINENO" 5 else - BREAKPAD_CFLAGS=$pkg_cv_BREAKPAD_CFLAGS - BREAKPAD_LIBS=$pkg_cv_BREAKPAD_LIBS + BREAKPAD_CFLAGS=$pkg_cv_BREAKPAD_CFLAGS + BREAKPAD_LIBS=$pkg_cv_BREAKPAD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -57556,12 +57497,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NCURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncursesw" 2>&1` + NCURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncursesw" 2>&1` else - NCURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncursesw" 2>&1` + NCURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncursesw" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NCURSES_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NCURSES_PKG_ERRORS" >&5 if test -n "${enable_ncurses}" @@ -57583,8 +57524,8 @@ fi else - NCURSES_CFLAGS=$pkg_cv_NCURSES_CFLAGS - NCURSES_LIBS=$pkg_cv_NCURSES_LIBS + NCURSES_CFLAGS=$pkg_cv_NCURSES_CFLAGS + NCURSES_LIBS=$pkg_cv_NCURSES_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -57752,14 +57693,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` + SRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` else - SRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` + SRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SRT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SRT_PKG_ERRORS" >&5 - if test x"$enable_srt" = "xyes" + if test x"$enable_srt" = "xyes" then : as_fn_error $? "Library srt >= 1.3.0 needed for srt was not found" "$LINENO" 5 else $as_nop @@ -57770,7 +57711,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_srt" = "xyes" + if test x"$enable_srt" = "xyes" then : as_fn_error $? "Library srt >= 1.3.0 needed for srt was not found" "$LINENO" 5 else $as_nop @@ -57779,11 +57720,11 @@ fi else - SRT_CFLAGS=$pkg_cv_SRT_CFLAGS - SRT_LIBS=$pkg_cv_SRT_LIBS + SRT_CFLAGS=$pkg_cv_SRT_CFLAGS + SRT_LIBS=$pkg_cv_SRT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBaccess_srt=libaccess_srt_plugin.la + LTLIBaccess_srt=libaccess_srt_plugin.la LTLIBaccess_output_srt=libaccess_output_srt_plugin.la @@ -57871,14 +57812,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` + SRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` else - SRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` + SRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "srt >= 1.3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SRT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SRT_PKG_ERRORS" >&5 - enable_srt=no + enable_srt=no if test x"$enable_srt" = "xyes" then : as_fn_error $? "Library srt >= 1.3.0 needed for srt was not found" "$LINENO" 5 @@ -57890,7 +57831,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_srt=no + enable_srt=no if test x"$enable_srt" = "xyes" then : as_fn_error $? "Library srt >= 1.3.0 needed for srt was not found" "$LINENO" 5 @@ -57900,11 +57841,11 @@ fi else - SRT_CFLAGS=$pkg_cv_SRT_CFLAGS - SRT_LIBS=$pkg_cv_SRT_LIBS + SRT_CFLAGS=$pkg_cv_SRT_CFLAGS + SRT_LIBS=$pkg_cv_SRT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_srt=yes + enable_srt=yes LTLIBaccess_srt=libaccess_srt_plugin.la @@ -58037,14 +57978,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgoom2" 2>&1` + GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgoom2" 2>&1` else - GOOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgoom2" 2>&1` + GOOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgoom2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GOOM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GOOM_PKG_ERRORS" >&5 - if test x"$enable_goom" = "xyes" + if test x"$enable_goom" = "xyes" then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 else $as_nop @@ -58055,7 +57996,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_goom" = "xyes" + if test x"$enable_goom" = "xyes" then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 else $as_nop @@ -58064,11 +58005,11 @@ fi else - GOOM_CFLAGS=$pkg_cv_GOOM_CFLAGS - GOOM_LIBS=$pkg_cv_GOOM_LIBS + GOOM_CFLAGS=$pkg_cv_GOOM_CFLAGS + GOOM_LIBS=$pkg_cv_GOOM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBgoom=libgoom_plugin.la + LTLIBgoom=libgoom_plugin.la @@ -58139,14 +58080,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgoom2" 2>&1` + GOOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgoom2" 2>&1` else - GOOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgoom2" 2>&1` + GOOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgoom2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GOOM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GOOM_PKG_ERRORS" >&5 - enable_goom=no + enable_goom=no if test x"$enable_goom" = "xyes" then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 @@ -58158,7 +58099,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_goom=no + enable_goom=no if test x"$enable_goom" = "xyes" then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 @@ -58168,11 +58109,11 @@ fi else - GOOM_CFLAGS=$pkg_cv_GOOM_CFLAGS - GOOM_LIBS=$pkg_cv_GOOM_LIBS + GOOM_CFLAGS=$pkg_cv_GOOM_CFLAGS + GOOM_LIBS=$pkg_cv_GOOM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_goom=yes + enable_goom=yes LTLIBgoom=libgoom_plugin.la @@ -58269,12 +58210,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PROJECTM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprojectM" 2>&1` + PROJECTM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprojectM" 2>&1` else - PROJECTM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprojectM" 2>&1` + PROJECTM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprojectM" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$PROJECTM_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$PROJECTM_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${PROJECTM_PKG_ERRORS}." >&5 @@ -58288,8 +58229,8 @@ printf "%s\n" "$as_me: WARNING: ${PROJECTM_PKG_ERRORS}." >&2;} else - PROJECTM_CFLAGS=$pkg_cv_PROJECTM_CFLAGS - PROJECTM_LIBS=$pkg_cv_PROJECTM_LIBS + PROJECTM_CFLAGS=$pkg_cv_PROJECTM_CFLAGS + PROJECTM_LIBS=$pkg_cv_PROJECTM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -58379,12 +58320,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VSXU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvsxu" 2>&1` + VSXU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvsxu" 2>&1` else - VSXU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvsxu" 2>&1` + VSXU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvsxu" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$VSXU_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$VSXU_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${VSXU_PKG_ERRORS}." >&5 @@ -58398,8 +58339,8 @@ printf "%s\n" "$as_me: WARNING: ${VSXU_PKG_ERRORS}." >&2;} else - VSXU_CFLAGS=$pkg_cv_VSXU_CFLAGS - VSXU_LIBS=$pkg_cv_VSXU_LIBS + VSXU_CFLAGS=$pkg_cv_VSXU_CFLAGS + VSXU_LIBS=$pkg_cv_VSXU_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -58494,14 +58435,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` + AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` else - AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` + AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$AVAHI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$AVAHI_PKG_ERRORS" >&5 - if test x"$enable_avahi" = "xyes" + if test x"$enable_avahi" = "xyes" then : as_fn_error $? "Library avahi-client >= 0.6 needed for avahi was not found" "$LINENO" 5 else $as_nop @@ -58512,7 +58453,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_avahi" = "xyes" + if test x"$enable_avahi" = "xyes" then : as_fn_error $? "Library avahi-client >= 0.6 needed for avahi was not found" "$LINENO" 5 else $as_nop @@ -58521,11 +58462,11 @@ fi else - AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS - AVAHI_LIBS=$pkg_cv_AVAHI_LIBS + AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS + AVAHI_LIBS=$pkg_cv_AVAHI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBavahi=libavahi_plugin.la + LTLIBavahi=libavahi_plugin.la @@ -58596,14 +58537,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` + AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` else - AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` + AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client >= 0.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$AVAHI_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$AVAHI_PKG_ERRORS" >&5 - enable_avahi=no + enable_avahi=no if test x"$enable_avahi" = "xyes" then : as_fn_error $? "Library avahi-client >= 0.6 needed for avahi was not found" "$LINENO" 5 @@ -58615,7 +58556,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_avahi=no + enable_avahi=no if test x"$enable_avahi" = "xyes" then : as_fn_error $? "Library avahi-client >= 0.6 needed for avahi was not found" "$LINENO" 5 @@ -58625,11 +58566,11 @@ fi else - AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS - AVAHI_LIBS=$pkg_cv_AVAHI_LIBS + AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS + AVAHI_LIBS=$pkg_cv_AVAHI_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_avahi=yes + enable_avahi=yes LTLIBavahi=libavahi_plugin.la @@ -58744,14 +58685,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 142" 2>&1` + UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 142" 2>&1` else - UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 142" 2>&1` + UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 142" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UDEV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UDEV_PKG_ERRORS" >&5 - if test x"$enable_udev" = "xyes" + if test x"$enable_udev" = "xyes" then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 else $as_nop @@ -58762,7 +58703,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_udev" = "xyes" + if test x"$enable_udev" = "xyes" then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 else $as_nop @@ -58771,11 +58712,11 @@ fi else - UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS - UDEV_LIBS=$pkg_cv_UDEV_LIBS + UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS + UDEV_LIBS=$pkg_cv_UDEV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBudev=libudev_plugin.la + LTLIBudev=libudev_plugin.la @@ -58846,14 +58787,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 142" 2>&1` + UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 142" 2>&1` else - UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 142" 2>&1` + UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 142" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UDEV_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UDEV_PKG_ERRORS" >&5 - enable_udev=no + enable_udev=no if test x"$enable_udev" = "xyes" then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 @@ -58865,7 +58806,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_udev=no + enable_udev=no if test x"$enable_udev" = "xyes" then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 @@ -58875,11 +58816,11 @@ fi else - UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS - UDEV_LIBS=$pkg_cv_UDEV_LIBS + UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS + UDEV_LIBS=$pkg_cv_UDEV_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_udev=yes + enable_udev=yes LTLIBudev=libudev_plugin.la @@ -58994,14 +58935,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` + MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` else - MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` + MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MTP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MTP_PKG_ERRORS" >&5 - if test x"$enable_mtp" = "xyes" + if test x"$enable_mtp" = "xyes" then : as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5 else $as_nop @@ -59012,7 +58953,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_mtp" = "xyes" + if test x"$enable_mtp" = "xyes" then : as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5 else $as_nop @@ -59021,11 +58962,11 @@ fi else - MTP_CFLAGS=$pkg_cv_MTP_CFLAGS - MTP_LIBS=$pkg_cv_MTP_LIBS + MTP_CFLAGS=$pkg_cv_MTP_CFLAGS + MTP_LIBS=$pkg_cv_MTP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBmtp=libmtp_plugin.la + LTLIBmtp=libmtp_plugin.la LTLIBaccess_mtp=libaccess_mtp_plugin.la @@ -59105,14 +59046,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` + MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` else - MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` + MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmtp >= 1.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MTP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MTP_PKG_ERRORS" >&5 - enable_mtp=no + enable_mtp=no if test x"$enable_mtp" = "xyes" then : as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5 @@ -59124,7 +59065,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_mtp=no + enable_mtp=no if test x"$enable_mtp" = "xyes" then : as_fn_error $? "Library libmtp >= 1.0.0 needed for mtp was not found" "$LINENO" 5 @@ -59134,11 +59075,11 @@ fi else - MTP_CFLAGS=$pkg_cv_MTP_CFLAGS - MTP_LIBS=$pkg_cv_MTP_LIBS + MTP_CFLAGS=$pkg_cv_MTP_CFLAGS + MTP_LIBS=$pkg_cv_MTP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_mtp=yes + enable_mtp=yes LTLIBmtp=libmtp_plugin.la @@ -59262,14 +59203,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libupnp" 2>&1` + UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libupnp" 2>&1` else - UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libupnp" 2>&1` + UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libupnp" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UPNP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UPNP_PKG_ERRORS" >&5 - if test x"$enable_upnp" = "xyes" + if test x"$enable_upnp" = "xyes" then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 else $as_nop @@ -59280,7 +59221,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_upnp" = "xyes" + if test x"$enable_upnp" = "xyes" then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 else $as_nop @@ -59289,11 +59230,11 @@ fi else - UPNP_CFLAGS=$pkg_cv_UPNP_CFLAGS - UPNP_LIBS=$pkg_cv_UPNP_LIBS + UPNP_CFLAGS=$pkg_cv_UPNP_CFLAGS + UPNP_LIBS=$pkg_cv_UPNP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBupnp=libupnp_plugin.la + LTLIBupnp=libupnp_plugin.la @@ -59364,14 +59305,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libupnp" 2>&1` + UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libupnp" 2>&1` else - UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libupnp" 2>&1` + UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libupnp" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$UPNP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$UPNP_PKG_ERRORS" >&5 - enable_upnp=no + enable_upnp=no if test x"$enable_upnp" = "xyes" then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 @@ -59383,7 +59324,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_upnp=no + enable_upnp=no if test x"$enable_upnp" = "xyes" then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 @@ -59393,11 +59334,11 @@ fi else - UPNP_CFLAGS=$pkg_cv_UPNP_CFLAGS - UPNP_LIBS=$pkg_cv_UPNP_LIBS + UPNP_CFLAGS=$pkg_cv_UPNP_CFLAGS + UPNP_LIBS=$pkg_cv_UPNP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_upnp=yes + enable_upnp=yes LTLIBupnp=libupnp_plugin.la @@ -59512,14 +59453,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MICRODNS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` + MICRODNS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` else - MICRODNS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` + MICRODNS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MICRODNS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MICRODNS_PKG_ERRORS" >&5 - if test x"$enable_microdns" = "xyes" + if test x"$enable_microdns" = "xyes" then : as_fn_error $? "Library microdns >= 0.1.2 needed for microdns was not found" "$LINENO" 5 else $as_nop @@ -59530,7 +59471,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_microdns" = "xyes" + if test x"$enable_microdns" = "xyes" then : as_fn_error $? "Library microdns >= 0.1.2 needed for microdns was not found" "$LINENO" 5 else $as_nop @@ -59539,11 +59480,11 @@ fi else - MICRODNS_CFLAGS=$pkg_cv_MICRODNS_CFLAGS - MICRODNS_LIBS=$pkg_cv_MICRODNS_LIBS + MICRODNS_CFLAGS=$pkg_cv_MICRODNS_CFLAGS + MICRODNS_LIBS=$pkg_cv_MICRODNS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBmicrodns=libmicrodns_plugin.la + LTLIBmicrodns=libmicrodns_plugin.la @@ -59614,14 +59555,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MICRODNS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` + MICRODNS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` else - MICRODNS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` + MICRODNS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "microdns >= 0.1.2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$MICRODNS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$MICRODNS_PKG_ERRORS" >&5 - enable_microdns=no + enable_microdns=no if test x"$enable_microdns" = "xyes" then : as_fn_error $? "Library microdns >= 0.1.2 needed for microdns was not found" "$LINENO" 5 @@ -59633,7 +59574,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_microdns=no + enable_microdns=no if test x"$enable_microdns" = "xyes" then : as_fn_error $? "Library microdns >= 0.1.2 needed for microdns was not found" "$LINENO" 5 @@ -59643,11 +59584,11 @@ fi else - MICRODNS_CFLAGS=$pkg_cv_MICRODNS_CFLAGS - MICRODNS_LIBS=$pkg_cv_MICRODNS_LIBS + MICRODNS_CFLAGS=$pkg_cv_MICRODNS_CFLAGS + MICRODNS_LIBS=$pkg_cv_MICRODNS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_microdns=yes + enable_microdns=yes LTLIBmicrodns=libmicrodns_plugin.la @@ -59765,14 +59706,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` else - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBXML2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBXML2_PKG_ERRORS" >&5 - if test x"$enable_libxml2" = "xyes" + if test x"$enable_libxml2" = "xyes" then : as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5 else $as_nop @@ -59783,7 +59724,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_libxml2" = "xyes" + if test x"$enable_libxml2" = "xyes" then : as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5 else $as_nop @@ -59792,11 +59733,11 @@ fi else - LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS - LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS + LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS + LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBxml=libxml_plugin.la + LTLIBxml=libxml_plugin.la @@ -59867,14 +59808,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` else - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBXML2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBXML2_PKG_ERRORS" >&5 - enable_libxml2=no + enable_libxml2=no if test x"$enable_libxml2" = "xyes" then : as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5 @@ -59886,7 +59827,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_libxml2=no + enable_libxml2=no if test x"$enable_libxml2" = "xyes" then : as_fn_error $? "Library libxml-2.0 >= 2.5 needed for libxml2 was not found" "$LINENO" 5 @@ -59896,11 +59837,11 @@ fi else - LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS - LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS + LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS + LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_libxml2=yes + enable_libxml2=yes LTLIBxml=libxml_plugin.la @@ -60104,12 +60045,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 3.3.6" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 3.3.6" 2>&1` else - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 3.3.6" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 3.3.6" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GNUTLS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GNUTLS_PKG_ERRORS" >&5 if test -n "${enable_gnutls}" @@ -60131,8 +60072,8 @@ fi else - GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS - GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS + GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS + GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -60209,12 +60150,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "taglib >= 1.9" 2>&1` + TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "taglib >= 1.9" 2>&1` else - TAGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "taglib >= 1.9" 2>&1` + TAGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "taglib >= 1.9" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$TAGLIB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$TAGLIB_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${TAGLIB_PKG_ERRORS}." >&5 @@ -60226,8 +60167,8 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${TAGLIB_PKG_ERRORS}." >&5 printf "%s\n" "$as_me: WARNING: ${TAGLIB_PKG_ERRORS}." >&2;} else - TAGLIB_CFLAGS=$pkg_cv_TAGLIB_CFLAGS - TAGLIB_LIBS=$pkg_cv_TAGLIB_LIBS + TAGLIB_CFLAGS=$pkg_cv_TAGLIB_CFLAGS + TAGLIB_LIBS=$pkg_cv_TAGLIB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -60321,14 +60262,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` + SECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` else - SECRET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` + SECRET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SECRET_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SECRET_PKG_ERRORS" >&5 - if test x"$enable_secret" = "xyes" + if test x"$enable_secret" = "xyes" then : as_fn_error $? "Library libsecret-1 >= 0.18 needed for secret was not found" "$LINENO" 5 else $as_nop @@ -60339,7 +60280,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_secret" = "xyes" + if test x"$enable_secret" = "xyes" then : as_fn_error $? "Library libsecret-1 >= 0.18 needed for secret was not found" "$LINENO" 5 else $as_nop @@ -60348,11 +60289,11 @@ fi else - SECRET_CFLAGS=$pkg_cv_SECRET_CFLAGS - SECRET_LIBS=$pkg_cv_SECRET_LIBS + SECRET_CFLAGS=$pkg_cv_SECRET_CFLAGS + SECRET_LIBS=$pkg_cv_SECRET_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBsecret=libsecret_plugin.la + LTLIBsecret=libsecret_plugin.la @@ -60423,14 +60364,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` + SECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` else - SECRET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` + SECRET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsecret-1 >= 0.18" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SECRET_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SECRET_PKG_ERRORS" >&5 - enable_secret=no + enable_secret=no if test x"$enable_secret" = "xyes" then : as_fn_error $? "Library libsecret-1 >= 0.18 needed for secret was not found" "$LINENO" 5 @@ -60442,7 +60383,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_secret=no + enable_secret=no if test x"$enable_secret" = "xyes" then : as_fn_error $? "Library libsecret-1 >= 0.18 needed for secret was not found" "$LINENO" 5 @@ -60452,11 +60393,11 @@ fi else - SECRET_CFLAGS=$pkg_cv_SECRET_CFLAGS - SECRET_LIBS=$pkg_cv_SECRET_LIBS + SECRET_CFLAGS=$pkg_cv_SECRET_CFLAGS + SECRET_LIBS=$pkg_cv_SECRET_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_secret=yes + enable_secret=yes LTLIBsecret=libsecret_plugin.la @@ -60657,14 +60598,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` + NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` else - NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` + NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NOTIFY_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NOTIFY_PKG_ERRORS" >&5 - if test x"$enable_notify" = "xyes" + if test x"$enable_notify" = "xyes" then : as_fn_error $? "Library libnotify gtk+-3.0 needed for notify was not found" "$LINENO" 5 else $as_nop @@ -60675,7 +60616,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x"$enable_notify" = "xyes" + if test x"$enable_notify" = "xyes" then : as_fn_error $? "Library libnotify gtk+-3.0 needed for notify was not found" "$LINENO" 5 else $as_nop @@ -60684,11 +60625,11 @@ fi else - NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS - NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS + NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS + NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LTLIBnotify=libnotify_plugin.la + LTLIBnotify=libnotify_plugin.la @@ -60759,14 +60700,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` + NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` else - NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` + NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify gtk+-3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$NOTIFY_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$NOTIFY_PKG_ERRORS" >&5 - enable_notify=no + enable_notify=no if test x"$enable_notify" = "xyes" then : as_fn_error $? "Library libnotify gtk+-3.0 needed for notify was not found" "$LINENO" 5 @@ -60778,7 +60719,7 @@ elif test $pkg_failed = untried; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_notify=no + enable_notify=no if test x"$enable_notify" = "xyes" then : as_fn_error $? "Library libnotify gtk+-3.0 needed for notify was not found" "$LINENO" 5 @@ -60788,11 +60729,11 @@ fi else - NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS - NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS + NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS + NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_notify=yes + enable_notify=yes LTLIBnotify=libnotify_plugin.la @@ -60890,12 +60831,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libplacebo >= 0.2.1" 2>&1` + LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libplacebo >= 0.2.1" 2>&1` else - LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libplacebo >= 0.2.1" 2>&1` + LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libplacebo >= 0.2.1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBPLACEBO_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBPLACEBO_PKG_ERRORS" >&5 if test -n "${enable_libplacebo}" @@ -60919,8 +60860,8 @@ enable_libplacebo="no" else - LIBPLACEBO_CFLAGS=$pkg_cv_LIBPLACEBO_CFLAGS - LIBPLACEBO_LIBS=$pkg_cv_LIBPLACEBO_LIBS + LIBPLACEBO_CFLAGS=$pkg_cv_LIBPLACEBO_CFLAGS + LIBPLACEBO_LIBS=$pkg_cv_LIBPLACEBO_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -62666,7 +62607,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vlc $as_me 3.0.18, which was +This file was extended by vlc $as_me 3.0.20, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -62734,7 +62675,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -vlc config.status 3.0.18 +vlc config.status 3.0.20 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Nru vlc-3.0.18/configure.ac vlc-3.0.20/configure.ac --- vlc-3.0.18/configure.ac 2022-10-11 17:12:06.000000000 +0000 +++ vlc-3.0.20/configure.ac 2023-10-30 07:25:45.000000000 +0000 @@ -1,11 +1,11 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 1999-2022 VLC authors and VideoLAN]) +AC_COPYRIGHT([Copyright 1999-2023 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.18) +AC_INIT(vlc, 3.0.20) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=18 +VERSION_REVISION=20 VERSION_EXTRA=0 VERSION_DEV= @@ -14,7 +14,7 @@ CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Vetinari" -COPYRIGHT_YEARS="1996-2022" +COPYRIGHT_YEARS="1996-2023" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) @@ -65,7 +65,7 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL AM_PROG_AS -AC_PROG_LEX +AC_PROG_LEX([noyywrap]) AC_PROG_YACC AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files]) @@ -711,15 +711,14 @@ AH_TEMPLATE(sockaddr_storage, [Define to `sockaddr' if does not define.]) dnl ` (fix VIM syntax highlight AH_TEMPLATE(ss_family, [Define to `sa_family' if does not define.]) dnl ` (fix VIM syntax highlight AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, - [AC_TRY_COMPILE( - [#include + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #if defined( _WIN32 ) # include #else # include - #endif], [struct sockaddr_storage addr;], - ac_cv_struct_sockaddr_storage=yes, - ac_cv_struct_sockaddr_storage=no)]) + #endif]], [[struct sockaddr_storage addr;]])], + [ac_cv_struct_sockaddr_storage=yes], + [ac_cv_struct_sockaddr_storage=no])]) AS_IF([test "${ac_cv_struct_sockaddr_storage}" = no], [ AC_DEFINE(sockaddr_storage, sockaddr) AC_DEFINE(ss_family, sa_family) @@ -861,8 +860,8 @@ AC_CACHE_CHECK([if C++ headers define locale_t], [ac_cv_cxx_locale_t], [ac_cv_cxx_locale_t=no - AC_TRY_COMPILE([#include ], [locale_t loc;], - [ac_cv_cxx_locale_t=yes])]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[locale_t loc;]])], + [ac_cv_cxx_locale_t=yes],[])]) if test "${ac_cv_cxx_locale_t}" != "no"; then AC_DEFINE(HAVE_CXX_LOCALE_T, 1, Define to 1 if C++ headers define locale_t) fi @@ -1198,7 +1197,7 @@ VLC_SAVE_FLAGS LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic" AC_CACHE_CHECK([if linker supports -Bsymbolic], [ac_cv_ld_bsymbolic], [ - AC_TRY_LINK([],, [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ ac_cv_ld_bsymbolic="-Wl,-Bsymbolic" ], [ ac_cv_ld_bsymbolic="" @@ -1211,7 +1210,7 @@ VLC_SAVE_FLAGS LDFLAGS="${LDFLAGS} -Wl,-z,defs" AC_CACHE_CHECK([if linker supports -z,defs], [ac_cv_ld_z_defs], [ - AC_TRY_LINK([],, [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ ac_cv_ld_z_defs="yes" ], [ ac_cv_ld_z_defs="no" @@ -1223,8 +1222,9 @@ AC_CACHE_CHECK([for __attribute__((packed))], [ac_cv_c_attribute_packed], [ac_cv_c_attribute_packed=no - AC_TRY_COMPILE(, [struct __attribute__((__packed__)) foo { int a; } b; (void)b;], - [ac_cv_c_attribute_packed=yes])]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], + [[struct __attribute__((__packed__)) foo { int a; } b; (void)b;]])], + [ac_cv_c_attribute_packed=yes],[])]) if test "${ac_cv_c_attribute_packed}" != "no"; then AC_DEFINE(HAVE_ATTRIBUTE_PACKED, 1, Support for __attribute__((packed)) for structs) fi @@ -1583,10 +1583,14 @@ VLC_SAVE_FLAGS AC_CACHE_CHECK([if $CC groks AltiVec inline assembly], [ac_cv_altivec_inline], - [AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], - ac_cv_altivec_inline="yes", - [CFLAGS="${CFLAGS} -Wa,-maltivec" - AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], + [AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[]], + [[asm volatile("vperm 0,1,2,3");]])], + [ac_cv_altivec_inline="yes"], + [CFLAGS="${CFLAGS} -Wa,-maltivec" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[]], + [[asm volatile("vperm 0,1,2,3");]])], [ac_cv_altivec_inline="-Wa,-maltivec"], ac_cv_altivec_inline=no) ])]) @@ -1618,7 +1622,7 @@ LDFLAGS="${LDFLAGS} -Wl,-framework,vecLib" AC_CACHE_CHECK([if linker needs -framework vecLib], [ac_cv_ld_altivec], - [AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_ld_altivec=yes],[ac_cv_ld_altivec=no])]) VLC_RESTORE_FLAGS AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ VLC_ADD_LIBS([libvlccore],[-Wl,-framework,vecLib]) diff -Nru vlc-3.0.18/contrib/src/aribb24/rules.mak vlc-3.0.20/contrib/src/aribb24/rules.mak --- vlc-3.0.18/contrib/src/aribb24/rules.mak 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/contrib/src/aribb24/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # aribb24 ARIBB24_VERSION := 1.0.3 -ARIBB24_URL := https://github.com/nkoriyama/aribb24/archive/v$(ARIBB24_VERSION).tar.gz +ARIBB24_URL := $(GITHUB)/nkoriyama/aribb24/archive/v$(ARIBB24_VERSION).tar.gz ifdef GPL ifdef GNUV3 diff -Nru vlc-3.0.18/contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch vlc-3.0.20/contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch --- vlc-3.0.18/contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch 2023-04-22 23:27:28.000000000 +0000 @@ -0,0 +1,44 @@ +From 3d18150434e374d1e7f3b2ff9973ff24c993dc36 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 3 Jun 2020 11:34:26 +0200 +Subject: [PATCH] add an option not to build the b25 sample code + +Given it's built with -Werror it may fail in many cases. +--- + Makefile.am | 2 ++ + configure.ac | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0cf8e51..dd9ddc8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,7 +17,9 @@ pkginclude_HEADERS = src/arib_std_b25_error_code.h src/b_cas_card_error_code.h \ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = src/aribb25.pc + ++if BUILD_B25 + bin_PROGRAMS = b25 ++endif + b25_SOURCES = src/td.c + b25_CFLAGS = $(AM_CFLAGS) -Wall -Werror $(pcsclite_CFLAGS) + b25_LDADD = libaribb25.la $(pcsclite_LIBS) $(PCSC_LIBS) +diff --git a/configure.ac b/configure.ac +index baa856e..292a748 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,6 +82,11 @@ AS_IF([test "$SYS" = mingw32],[ + ], [AC_MSG_ERROR([${pcsclite_PKG_ERRORS}.])]) + ]) + ++AC_ARG_ENABLE([b25], ++ AS_HELP_STRING([--disable-b25], [don't build the b25 sample app])) ++AM_CONDITIONAL([BUILD_B25], [test "${enable_b25}" != "no"]) ++ ++ + AC_CONFIG_HEADERS([src/config.h]) + AC_CONFIG_FILES([Makefile src/aribb25.pc]) + AC_OUTPUT +-- +2.26.0.windows.1 + diff -Nru vlc-3.0.18/contrib/src/aribb25/0001-fix-build-script.patch vlc-3.0.20/contrib/src/aribb25/0001-fix-build-script.patch --- vlc-3.0.18/contrib/src/aribb25/0001-fix-build-script.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/aribb25/0001-fix-build-script.patch 2023-04-22 23:27:28.000000000 +0000 @@ -0,0 +1,70 @@ +From 1fb7ec239b4ef7bf05f824af9b3ddef7f5601685 Mon Sep 17 00:00:00 2001 +From: midchildan +Date: Sun, 4 Feb 2018 23:00:27 +0900 +Subject: [PATCH 1/2] fix build script + +Signed-off-by: Yuudai Yamashigi +--- + Makefile.am | 7 ++++++- + configure.ac | 1 + + src/td.c | 3 ++- + 4 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b95a569..ee4d508 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 + lib_LTLIBRARIES = libaribb25.la + libaribb25_la_SOURCES = src/arib_std_b25.c src/b_cas_card.c src/multi2.c \ + src/portable.h src/ts_section_parser.c src/arib_std_b25_error_code.h \ +- src/b_cas_card_error_code.h src/multi2_error_code.h src/td.c \ ++ src/b_cas_card_error_code.h src/multi2_error_code.h \ + src/ts_section_parser_error_code.h src/arib_std_b25.h src/b_cas_card.h \ + src/multi2.h src/ts_common_types.h src/ts_section_parser.h src/aribb25api.h + libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_CFLAGS) $(PCSC_LIBS) +@@ -17,4 +17,9 @@ pkginclude_HEADERS = src/arib_std_b25_error_code.h src/b_cas_card_error_code.h \ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = src/aribb25.pc + ++bin_PROGRAMS = b25 ++b25_SOURCES = src/td.c ++b25_CFLAGS = $(AM_CFLAGS) -Wall -Werror $(pcsclite_CFLAGS) ++b25_LDADD = libaribb25.la $(pcsclite_LIBS) $(PCSC_LIBS) ++ + dist_doc_DATA = README.jp.txt README.md LICENCE +diff --git a/configure.ac b/configure.ac +index ec1d35f..baa856e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,5 +82,6 @@ AS_IF([test "$SYS" = mingw32],[ + ], [AC_MSG_ERROR([${pcsclite_PKG_ERRORS}.])]) + ]) + ++AC_CONFIG_HEADERS([src/config.h]) + AC_CONFIG_FILES([Makefile src/aribb25.pc]) + AC_OUTPUT +diff --git a/src/td.c b/src/td.c +index c27201f..288aa5a 100644 +--- a/src/td.c ++++ b/src/td.c +@@ -37,6 +37,7 @@ PERFORMANCE OF THIS SOFTWARE. + + #include "arib_std_b25.h" + #include "b_cas_card.h" ++#include "config.h" + + typedef struct { + int32_t round; +@@ -85,7 +86,7 @@ int main(int argc, char **argv) + + static void show_usage() + { +- fprintf(stderr, "b25 - ARIB STD-B25 test program ver. 0.2.5 (2012, 2/13)\n"); ++ fprintf(stderr, "%s\n", PACKAGE_STRING); + fprintf(stderr, "usage: b25 [options] src.m2t dst.m2t [more pair ..]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " -r round (integer, default=4)\n"); +-- +2.26.0.windows.1 + diff -Nru vlc-3.0.18/contrib/src/aribb25/0002-fix-libs-include.patch vlc-3.0.20/contrib/src/aribb25/0002-fix-libs-include.patch --- vlc-3.0.18/contrib/src/aribb25/0002-fix-libs-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/aribb25/0002-fix-libs-include.patch 2023-04-22 23:27:28.000000000 +0000 @@ -0,0 +1,25 @@ +From c14938692b313b5ba953543fd94fd1cad0eeef18 Mon Sep 17 00:00:00 2001 +From: Yuudai Yamashigi +Date: Tue, 6 Feb 2018 23:37:48 +0100 +Subject: [PATCH 2/2] fix libs include + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ee4d508..0cf8e51 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ libaribb25_la_SOURCES = src/arib_std_b25.c src/b_cas_card.c src/multi2.c \ + src/b_cas_card_error_code.h src/multi2_error_code.h \ + src/ts_section_parser_error_code.h src/arib_std_b25.h src/b_cas_card.h \ + src/multi2.h src/ts_common_types.h src/ts_section_parser.h src/aribb25api.h +-libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_CFLAGS) $(PCSC_LIBS) ++libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_LIBS) $(PCSC_LIBS) + libaribb25_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -fvisibility=hidden $(pcsclite_CFLAGS) + + pkginclude_HEADERS = src/arib_std_b25_error_code.h src/b_cas_card_error_code.h \ +-- +2.26.0.windows.1 + diff -Nru vlc-3.0.18/contrib/src/aribb25/rules.mak vlc-3.0.20/contrib/src/aribb25/rules.mak --- vlc-3.0.18/contrib/src/aribb25/rules.mak 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/contrib/src/aribb25/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -20,9 +20,13 @@ aribb25: aribb25-$(ARIBB25_VERSION).tar.gz .sum-aribb25 $(UNPACK) + $(APPLY) $(SRC)/aribb25/0001-fix-build-script.patch + $(APPLY) $(SRC)/aribb25/0002-fix-libs-include.patch + $(APPLY) $(SRC)/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch $(MOVE) .aribb25: aribb25 - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) + $(RECONF) + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-b25 cd $< && $(MAKE) && $(MAKE) install touch $@ diff -Nru vlc-3.0.18/contrib/src/ass/SHA512SUMS vlc-3.0.20/contrib/src/ass/SHA512SUMS --- vlc-3.0.18/contrib/src/ass/SHA512SUMS 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/ass/SHA512SUMS 2023-08-05 10:03:51.000000000 +0000 @@ -1 +1 @@ -1d2fd02fb2669de7f38ecfa0fe79e3c89da93e09c3cf6bf7b7b811a4808a06fd702da27ba1d9223c9a8a943198e7961b06c808a07e17d6cc6ba2ce70fd802300 libass-0.16.0.tar.gz +29c3f82e8d68ffc403941805202c4756b65cf48aeadbe9ae5e307ee4f52a5e4d916330ad26ec322aa92ddc72a4f01633033f9f628dbb8d8653a74b3e6eb7f735 libass-0.17.1.tar.gz diff -Nru vlc-3.0.18/contrib/src/ass/rules.mak vlc-3.0.20/contrib/src/ass/rules.mak --- vlc-3.0.18/contrib/src/ass/rules.mak 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/ass/rules.mak 2023-09-30 09:35:55.000000000 +0000 @@ -1,6 +1,6 @@ # ASS -ASS_VERSION := 0.16.0 -ASS_URL := https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz +ASS_VERSION := 0.17.1 +ASS_URL := $(GITHUB)/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz PKGS += ass ifeq ($(call need_pkg,"libass"),) @@ -9,7 +9,6 @@ ifdef HAVE_ANDROID WITH_FONTCONFIG = 0 -WITH_HARFBUZZ = 1 ifeq ($(ANDROID_ABI), x86) WITH_ASS_ASM = 0 endif @@ -20,15 +19,12 @@ else ifdef HAVE_DARWIN_OS WITH_FONTCONFIG = 0 -WITH_HARFBUZZ = 1 else ifdef HAVE_WINSTORE WITH_FONTCONFIG = 0 -WITH_HARFBUZZ = 1 WITH_DWRITE = 1 else WITH_FONTCONFIG = 1 -WITH_HARFBUZZ = 1 endif endif endif @@ -43,8 +39,9 @@ $(UNPACK) $(MOVE) -DEPS_ass = freetype2 $(DEPS_freetype2) fribidi iconv $(DEPS_iconv) +DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv) harfbuzz $(DEPS_harfbuzz) +ASS_CONF = --disable-test ifneq ($(WITH_FONTCONFIG), 0) DEPS_ass += fontconfig $(DEPS_fontconfig) else @@ -55,24 +52,12 @@ ASS_CONF += --enable-directwrite endif -ifneq ($(WITH_HARFBUZZ), 0) -DEPS_ass += harfbuzz $(DEPS_harfbuzz) -else -ASS_CONF += --disable-harfbuzz -endif - ifeq ($(WITH_ASS_ASM), 0) ASS_CONF += --disable-asm endif -ifdef WITH_OPTIMIZATION -ASS_CFLAGS += -O3 -else -ASS_CFLAGS += -g -endif - .ass: libass - cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure $(HOSTCONF) $(ASS_CONF) + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(ASS_CONF) cd $< && $(MAKE) $(call pkg_static,"libass.pc") cd $< && $(MAKE) install diff -Nru vlc-3.0.18/contrib/src/breakpad/rules.mak vlc-3.0.20/contrib/src/breakpad/rules.mak --- vlc-3.0.18/contrib/src/breakpad/rules.mak 2021-07-06 21:47:27.000000000 +0000 +++ vlc-3.0.20/contrib/src/breakpad/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -16,6 +16,7 @@ breakpad: breakpad-$(BREAKPAD_VERSION).tar.gz .sum-breakpad $(UNPACK) $(APPLY) $(SRC)/breakpad/0001-mac-client-Upgrade-Breakpad.xib-to-new-format.patch + sed -i.orig -e "s/GCC_TREAT_WARNINGS_AS_ERRORS = YES/GCC_TREAT_WARNINGS_AS_ERRORS = NO/" "$(UNPACK_DIR)/src/common/mac/Breakpad.xcconfig" $(MOVE) .breakpad: breakpad diff -Nru vlc-3.0.18/contrib/src/caca/rules.mak vlc-3.0.20/contrib/src/caca/rules.mak --- vlc-3.0.18/contrib/src/caca/rules.mak 2022-05-28 15:42:33.000000000 +0000 +++ vlc-3.0.20/contrib/src/caca/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,6 +1,6 @@ # CACA CACA_VERSION := 0.99.beta20 -CACA_URL := https://github.com/cacalabs/libcaca/releases/download/v$(CACA_VERSION)/libcaca-$(CACA_VERSION).tar.gz +CACA_URL := $(GITHUB)/cacalabs/libcaca/releases/download/v$(CACA_VERSION)/libcaca-$(CACA_VERSION).tar.gz ifndef HAVE_DARWIN_OS ifndef HAVE_LINUX # see VLC Trac 17251 diff -Nru vlc-3.0.18/contrib/src/d3d11/rules.mak vlc-3.0.20/contrib/src/d3d11/rules.mak --- vlc-3.0.18/contrib/src/d3d11/rules.mak 2021-05-26 08:24:22.000000000 +0000 +++ vlc-3.0.20/contrib/src/d3d11/rules.mak 2023-04-22 23:27:28.000000000 +0000 @@ -6,6 +6,7 @@ #ugly way to get the default location of standard idl files IDL_INCLUDES = -I/`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include endif +IDL_INCLUDES += -Ipthreads/mingw-w64-headers/include D3D11_COMMIT_ID := a0cd5afeb60be3be0860e9a203314c10485bb9b8 D3D11_1_COMMIT_ID := aa6ab47929a9cac6897f38e630ce0bb88458e288 @@ -40,6 +41,7 @@ ifdef HAVE_WIN32 PKGS += d3d11 endif +DEPS_d3d11 = pthreads $(DEPS_pthreads) $(TARBALLS)/d3d11.idl: $(call download_pkg,$(D3D11_IDL_URL),d3d11) diff -Nru vlc-3.0.18/contrib/src/daala/rules.mak vlc-3.0.20/contrib/src/daala/rules.mak --- vlc-3.0.18/contrib/src/daala/rules.mak 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/contrib/src/daala/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -1,5 +1,5 @@ DAALA_VERSION := e248823a04292a8c2f56aa260f5c0b369d41d64e -DAALA_GITURL := http://git.xiph.org/daala.git +DAALA_GITURL := http://gitlab.xiph.org/xiph/daala.git # Default disabled for now # PKGS += daala diff -Nru vlc-3.0.18/contrib/src/dav1d/SHA512SUMS vlc-3.0.20/contrib/src/dav1d/SHA512SUMS --- vlc-3.0.18/contrib/src/dav1d/SHA512SUMS 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/dav1d/SHA512SUMS 2023-10-20 02:02:44.000000000 +0000 @@ -1 +1 @@ -a3a7e162e45181449cd42af3a4d36669a850a4ee9ab17641dcd63d84406444566e8ebc7caa55b0620ab581039f36d19a90218a40f52ebbe525b37ed9493fb3f3 dav1d-1.0.0.tar.xz +a91d217b8656c452dd80f5597e988f0e7a2ea32b12092c2695e7dc388033db7b193f7a8c98413bec31d1c38af376561d39f7618b935c4feeb6498c5d2b43f6a4 dav1d-1.3.0.tar.xz diff -Nru vlc-3.0.18/contrib/src/dav1d/rules.mak vlc-3.0.20/contrib/src/dav1d/rules.mak --- vlc-3.0.18/contrib/src/dav1d/rules.mak 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/dav1d/rules.mak 2023-10-20 02:02:44.000000000 +0000 @@ -1,6 +1,6 @@ # libdav1d -DAV1D_VERSION := 1.0.0 +DAV1D_VERSION := 1.3.0 DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz PKGS += dav1d diff -Nru vlc-3.0.18/contrib/src/ebml/SHA512SUMS vlc-3.0.20/contrib/src/ebml/SHA512SUMS --- vlc-3.0.18/contrib/src/ebml/SHA512SUMS 2021-03-20 18:20:19.000000000 +0000 +++ vlc-3.0.20/contrib/src/ebml/SHA512SUMS 2023-04-22 23:27:28.000000000 +0000 @@ -1 +1 @@ -b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5 libebml-1.4.2.tar.xz +6a7a544f3f5a273eaab8c71aa692492cbfb671b3d73f03ab76438843a9a7a9379f9cffdae0e1452cf064e43c10ad82424645504a23d7f3336eabcd38f2621d0a libebml-1.4.3.tar.xz diff -Nru vlc-3.0.18/contrib/src/ebml/rules.mak vlc-3.0.20/contrib/src/ebml/rules.mak --- vlc-3.0.18/contrib/src/ebml/rules.mak 2021-03-20 18:20:19.000000000 +0000 +++ vlc-3.0.20/contrib/src/ebml/rules.mak 2023-04-22 23:27:28.000000000 +0000 @@ -1,6 +1,6 @@ # ebml -EBML_VERSION := 1.4.2 +EBML_VERSION := 1.4.3 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.xz ifeq ($(call need_pkg,"libebml >= 1.3.8"),) diff -Nru vlc-3.0.18/contrib/src/ffmpeg/SHA512SUMS vlc-3.0.20/contrib/src/ffmpeg/SHA512SUMS --- vlc-3.0.18/contrib/src/ffmpeg/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/ffmpeg/SHA512SUMS 2023-01-01 22:21:52.000000000 +0000 @@ -0,0 +1 @@ +0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915 ffmpeg-4.4.3.tar.xz diff -Nru vlc-3.0.18/contrib/src/ffmpeg/rules.mak vlc-3.0.20/contrib/src/ffmpeg/rules.mak --- vlc-3.0.18/contrib/src/ffmpeg/rules.mak 2022-09-30 07:59:11.000000000 +0000 +++ vlc-3.0.20/contrib/src/ffmpeg/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -6,7 +6,11 @@ ifndef USE_LIBAV FFMPEG_HASH=ec47a3b95f88fc3f820b900038ac439e4eb3fede -FFMPEG_BRANCH=release/4.4 +FFMPEG_MAJVERSION := 4.4 +FFMPEG_REVISION := 3 +FFMPEG_VERSION := $(FFMPEG_MAJVERSION).$(FFMPEG_REVISION) +FFMPEG_BRANCH=release/$(FFMPEG_MAJVERSION) +FFMPEG_URL := https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git FFMPEG_LAVC_MIN := 57.37.100 @@ -225,14 +229,19 @@ $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz: $(call download_git,$(FFMPEG_GITURL),$(FFMPEG_BRANCH),$(FFMPEG_HASH)) -.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz - $(call check_githash,$(FFMPEG_HASH)) - touch $@ - -ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg - rm -Rf $@ $@-$(FFMPEG_BASENAME) - mkdir -p $@-$(FFMPEG_BASENAME) - tar xvJfo "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME) +# .sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz +# $(call check_githash,$(FFMPEG_HASH)) +# touch $@ + +$(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.xz: + $(call download_pkg,$(FFMPEG_URL),ffmpeg) + +.sum-ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz + +ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz .sum-ffmpeg + rm -Rf $@ $@-$(FFMPEG_VERSION) + mkdir -p $@-$(FFMPEG_VERSION) + tar xvJfo "$<" --strip-components=1 -C $@-$(FFMPEG_VERSION) ifdef USE_FFMPEG $(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch $(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch diff -Nru vlc-3.0.18/contrib/src/fluidlite/rules.mak vlc-3.0.20/contrib/src/fluidlite/rules.mak --- vlc-3.0.18/contrib/src/fluidlite/rules.mak 2021-01-17 20:31:01.000000000 +0000 +++ vlc-3.0.20/contrib/src/fluidlite/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # fluidlite -FLUID_GITURL := https://github.com/divideconcept/FluidLite.git -FLUID_HASH := a95c0303a40deb335dd3e51a8a783bb99a403c31 +FLUID_GITURL := $(GITHUB)/divideconcept/FluidLite.git +FLUID_HASH := 238997654efb20e736512847f3f5f6d618de9423 ifdef HAVE_WIN32 PKGS += fluidlite @@ -24,8 +24,10 @@ $(UNPACK) $(MOVE) +FLUIDLITE_CONF := -DFLUIDLITE_BUILD_SHARED=OFF + .fluidlite: fluidlite toolchain.cmake cd $< && rm -f CMakeCache.txt - cd $< && $(HOSTVARS) $(CMAKE) + cd $< && $(HOSTVARS) $(CMAKE) $(FLUIDLITE_CONF) cd $< && $(CMAKEBUILD) . --target install touch $@ diff -Nru vlc-3.0.18/contrib/src/fribidi/rules.mak vlc-3.0.20/contrib/src/fribidi/rules.mak --- vlc-3.0.18/contrib/src/fribidi/rules.mak 2022-05-31 16:10:59.000000000 +0000 +++ vlc-3.0.20/contrib/src/fribidi/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,6 +1,6 @@ # FRIBIDI FRIBIDI_VERSION := 1.0.12 -FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz +FRIBIDI_URL := $(GITHUB)/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz PKGS += fribidi ifeq ($(call need_pkg,"fribidi"),) diff -Nru vlc-3.0.18/contrib/src/growl/rules.mak vlc-3.0.20/contrib/src/growl/rules.mak --- vlc-3.0.18/contrib/src/growl/rules.mak 2020-10-24 18:21:13.000000000 +0000 +++ vlc-3.0.20/contrib/src/growl/rules.mak 2023-02-11 09:33:17.000000000 +0000 @@ -24,6 +24,12 @@ .growl: growl cd $< && xcodebuild $(XCODE_FLAGS) MACOSX_DEPLOYMENT_TARGET=10.7 CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" GCC_TREAT_WARNINGS_AS_ERRORS=NO -target Growl.framework -configuration Release + + # Support for macOS 10.7 on intel builds +ifeq ($(ARCH),x86_64) + cd $< && install_name_tool -change /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices build/Release/Growl.framework/Growl +endif + install -d $(PREFIX) cd $< && mkdir -p "$(PREFIX)/Frameworks" && rm -Rf $(PREFIX)/Frameworks/Growl.framework && \ cp -Rf build/Release/Growl.framework "$(PREFIX)/Frameworks" diff -Nru vlc-3.0.18/contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch vlc-3.0.20/contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch --- vlc-3.0.18/contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch 2023-01-01 22:21:52.000000000 +0000 @@ -0,0 +1,67 @@ +From 1a4fd470808067717e6b9b228ec1cb0eab26039e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Fri, 28 Oct 2022 22:17:15 +0300 +Subject: [PATCH 1/2] freetype: Fix function signatures to match without casts + +Clang 16 has got a new stricter warning for casts of function types +(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57). + +This new warning gets included as part of the existing error +diagnostic setting of -Wcast-function-type. + +This fixes errors like these: + +../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--- + src/hb-ft.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/hb-ft.cc b/src/hb-ft.cc +index 67691e3ff..37f9f7f84 100644 +--- a/src/hb-ft.cc ++++ b/src/hb-ft.cc +@@ -732,8 +732,9 @@ hb_ft_face_create_referenced (FT_Face ft_face) + } + + static void +-hb_ft_face_finalize (FT_Face ft_face) ++hb_ft_face_finalize (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_face_destroy ((hb_face_t *) ft_face->generic.data); + } + +@@ -765,7 +766,7 @@ hb_ft_face_create_cached (FT_Face ft_face) + ft_face->generic.finalizer (ft_face); + + ft_face->generic.data = hb_ft_face_create (ft_face, nullptr); +- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; ++ ft_face->generic.finalizer = hb_ft_face_finalize; + } + + return hb_face_reference ((hb_face_t *) ft_face->generic.data); +@@ -946,8 +947,9 @@ get_ft_library () + } + + static void +-_release_blob (FT_Face ft_face) ++_release_blob (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); + } + +@@ -1029,7 +1031,7 @@ hb_ft_font_set_funcs (hb_font_t *font) + #endif + + ft_face->generic.data = blob; +- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; ++ ft_face->generic.finalizer = _release_blob; + + _hb_ft_font_set_funcs (font, ft_face, true); + hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); +-- +2.25.1 + diff -Nru vlc-3.0.18/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch vlc-3.0.20/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch --- vlc-3.0.18/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch 2023-01-01 22:21:52.000000000 +0000 @@ -0,0 +1,25 @@ +From b1f1c6e3951f7e28ce1c57248f8141cde40d2002 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Fri, 28 Oct 2022 14:19:39 -0600 +Subject: [PATCH 2/2] Disable -Wcast-function-type-strict + +https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126 +--- + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/hb.hh b/src/hb.hh +index b9f5f7141..32838ff9b 100644 +--- a/src/hb.hh ++++ b/src/hb.hh +@@ -126,6 +126,7 @@ + /* Ignored intentionally. */ + #ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC_IGNORED + #pragma GCC diagnostic ignored "-Wclass-memaccess" ++#pragma GCC diagnostic ignored "-Wcast-function-type-strict" // https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126 + #pragma GCC diagnostic ignored "-Wformat-nonliteral" + #pragma GCC diagnostic ignored "-Wformat-zero-length" + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" +-- +2.25.1 + diff -Nru vlc-3.0.18/contrib/src/harfbuzz/rules.mak vlc-3.0.20/contrib/src/harfbuzz/rules.mak --- vlc-3.0.18/contrib/src/harfbuzz/rules.mak 2022-05-31 16:10:59.000000000 +0000 +++ vlc-3.0.20/contrib/src/harfbuzz/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # HARFBUZZ HARFBUZZ_VERSION := 3.4.0 -HARFBUZZ_URL := https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz +HARFBUZZ_URL := $(GITHUB)/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz PKGS += harfbuzz ifeq ($(call need_pkg,"harfbuzz"),) PKGS_FOUND += harfbuzz @@ -15,6 +15,8 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz $(UNPACK) $(APPLY) $(SRC)/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch + $(APPLY) $(SRC)/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch + $(APPLY) $(SRC)/harfbuzz/0002-Disable-Wcast-function-type-strict.patch $(MOVE) DEPS_harfbuzz = freetype2 $(DEPS_freetype2) diff -Nru vlc-3.0.18/contrib/src/jack/rules.mak vlc-3.0.20/contrib/src/jack/rules.mak --- vlc-3.0.18/contrib/src/jack/rules.mak 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/contrib/src/jack/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # JACK JACK_VERSION := 0.121.3 -JACK_URL := https://github.com/jackaudio/jack1/archive/$(JACK_VERSION).tar.gz +JACK_URL := $(GITHUB)/jackaudio/jack1/archive/$(JACK_VERSION).tar.gz # disabled by default for now #PKGS += jack diff -Nru vlc-3.0.18/contrib/src/libdsm/rules.mak vlc-3.0.20/contrib/src/libdsm/rules.mak --- vlc-3.0.18/contrib/src/libdsm/rules.mak 2022-07-23 08:04:37.000000000 +0000 +++ vlc-3.0.20/contrib/src/libdsm/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # libdsm LIBDSM_VERSION := 0.4.3 -LIBDSM_URL := https://github.com/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.xz +LIBDSM_URL := $(GITHUB)/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.xz ifeq ($(call need_pkg,"libdsm >= 0.2.0"),) PKGS_FOUND += libdsm diff -Nru vlc-3.0.18/contrib/src/main.mak vlc-3.0.20/contrib/src/main.mak --- vlc-3.0.18/contrib/src/main.mak 2022-05-31 16:10:59.000000000 +0000 +++ vlc-3.0.20/contrib/src/main.mak 2023-08-05 10:03:51.000000000 +0000 @@ -379,9 +379,9 @@ done ifdef HAVE_DARWIN_OS -AUTORECONF = AUTOPOINT=true autoreconf +AUTORECONF = AUTOPOINT=true GTKDOCIZE=true autoreconf else -AUTORECONF = autoreconf +AUTORECONF = GTKDOCIZE=true autoreconf endif RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \ cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS) diff -Nru vlc-3.0.18/contrib/src/mfx/rules.mak vlc-3.0.20/contrib/src/mfx/rules.mak --- vlc-3.0.18/contrib/src/mfx/rules.mak 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/contrib/src/mfx/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,6 +1,6 @@ # mfx (Media SDK) -mfx_GITURL := https://github.com/lu-zero/mfx_dispatch.git +mfx_GITURL := $(GITHUB)/lu-zero/mfx_dispatch.git MFX_GITHASH := 7efc7505465bc1f16fbd1da3d24aa5bd9d46c5ca ifeq ($(call need_pkg,"mfx"),) diff -Nru vlc-3.0.18/contrib/src/microdns/rules.mak vlc-3.0.20/contrib/src/microdns/rules.mak --- vlc-3.0.18/contrib/src/microdns/rules.mak 2020-07-27 08:31:07.000000000 +0000 +++ vlc-3.0.20/contrib/src/microdns/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # libmicrodns LIBMICRODNS_VERSION := 0.1.2 -LIBMICRODNS_URL := https://github.com/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.xz +LIBMICRODNS_URL := $(GITHUB)/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.xz ifndef HAVE_DARWIN_OS ifdef BUILD_NETWORK diff -Nru vlc-3.0.18/contrib/src/mysofa/rules.mak vlc-3.0.20/contrib/src/mysofa/rules.mak --- vlc-3.0.18/contrib/src/mysofa/rules.mak 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/contrib/src/mysofa/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # Mysofa MYSOFA_VERSION := 0.5 -MYSOFA_URL = https://github.com/hoene/libmysofa/archive/v$(MYSOFA_VERSION).tar.gz +MYSOFA_URL = $(GITHUB)/hoene/libmysofa/archive/v$(MYSOFA_VERSION).tar.gz PKGS += mysofa diff -Nru vlc-3.0.18/contrib/src/nfs/rules.mak vlc-3.0.20/contrib/src/nfs/rules.mak --- vlc-3.0.18/contrib/src/nfs/rules.mak 2022-02-21 09:19:25.000000000 +0000 +++ vlc-3.0.20/contrib/src/nfs/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,6 +1,6 @@ # NFS NFS_VERSION := 5.0.1 -NFS_URL := https://github.com/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz +NFS_URL := $(GITHUB)/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz PKGS += nfs ifeq ($(call need_pkg,"libnfs >= 1.10"),) diff -Nru vlc-3.0.18/contrib/src/openjpeg/rules.mak vlc-3.0.20/contrib/src/openjpeg/rules.mak --- vlc-3.0.18/contrib/src/openjpeg/rules.mak 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/contrib/src/openjpeg/rules.mak 2023-09-30 09:35:55.000000000 +0000 @@ -1,7 +1,7 @@ # jpeg OPENJPEG_VERSION := 2.3.0 -OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz +OPENJPEG_URL := $(GITHUB)/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz ifdef HAVE_WIN32 DEPS_openjpeg += pthreads $(DEPS_pthreads) diff -Nru vlc-3.0.18/contrib/src/protobuf/rules.mak vlc-3.0.20/contrib/src/protobuf/rules.mak --- vlc-3.0.18/contrib/src/protobuf/rules.mak 2022-02-21 09:19:30.000000000 +0000 +++ vlc-3.0.20/contrib/src/protobuf/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,6 +1,6 @@ # protobuf PROTOBUF_VERSION := 3.1.0 -PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz +PROTOBUF_URL := $(GITHUB)/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PKGS += protobuf ifeq ($(call need_pkg, "protobuf-lite >= 3.1.0 protobuf-lite < 3.2.0"),) diff -Nru vlc-3.0.18/contrib/src/pthreads/0001-headers-Update-to-Wine-master-and-regenerate-H-from-.patch vlc-3.0.20/contrib/src/pthreads/0001-headers-Update-to-Wine-master-and-regenerate-H-from-.patch --- vlc-3.0.18/contrib/src/pthreads/0001-headers-Update-to-Wine-master-and-regenerate-H-from-.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/pthreads/0001-headers-Update-to-Wine-master-and-regenerate-H-from-.patch 2023-04-22 23:27:28.000000000 +0000 @@ -0,0 +1,62 @@ +From d4249c712991ab191f05968470b34587cc716a53 Mon Sep 17 00:00:00 2001 +From: LIU Hao +Date: Sat, 18 Mar 2023 14:59:38 +0800 +Subject: [PATCH 1/2] headers: Update to Wine master and regenerate H from IDL + (edited) + +Signed-off-by: LIU Hao + +edited: +* only kept the dxvahd.h changes +--- + mingw-w64-headers/include/dxvahd.h | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/mingw-w64-headers/include/dxvahd.h b/mingw-w64-headers/include/dxvahd.h +index 71b027863..aaff9400c 100644 +--- a/mingw-w64-headers/include/dxvahd.h ++++ b/mingw-w64-headers/include/dxvahd.h +@@ -251,10 +251,16 @@ typedef struct _DXVAHD_BLT_STATE_CONSTRICTION_DATA { + SIZE Size; + } DXVAHD_BLT_STATE_CONSTRICTION_DATA; + typedef struct _DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE_DATA { +- UINT Usage : 1; +- UINT RGB_Range : 1; +- UINT YCbCr_Matrix : 1; +- UINT YCbCr_xvYCC : 1; ++ __C89_NAMELESS union { ++ __C89_NAMELESS struct { ++ UINT Usage : 1; ++ UINT RGB_Range : 1; ++ UINT YCbCr_Matrix : 1; ++ UINT YCbCr_xvYCC : 1; ++ UINT Reserved : 28; ++ } __C89_NAMELESSSTRUCTNAME; ++ UINT Value; ++ } __C89_NAMELESSUNIONNAME; + } DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE_DATA; + typedef struct _DXVAHD_BLT_STATE_PRIVATE_DATA { + GUID Guid; +@@ -332,10 +338,15 @@ typedef struct _DXVAHD_STREAM_STATE_FRAME_FORMAT_DATA { + DXVAHD_FRAME_FORMAT FrameFormat; + } DXVAHD_STREAM_STATE_FRAME_FORMAT_DATA; + typedef struct _DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE_DATA { +- UINT Type : 1; +- UINT RGB_Range : 1; +- UINT YCbCr_Matrix : 1; +- UINT YCbCr_xvYCC : 1; ++ __C89_NAMELESS union { ++ __C89_NAMELESS struct { ++ UINT Type : 1; ++ UINT RGB_Range : 1; ++ UINT YCbCr_Matrix : 1; ++ UINT YCbCr_xvYCC : 1; ++ } __C89_NAMELESSSTRUCTNAME; ++ UINT Value; ++ } __C89_NAMELESSUNIONNAME; + } DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE_DATA; + typedef struct _DXVAHD_STREAM_STATE_LUMA_KEY_DATA { + WINBOOL Enable; +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.18/contrib/src/pthreads/0002-headers-dxvahd-Regenerate-H-from-IDL.patch vlc-3.0.20/contrib/src/pthreads/0002-headers-dxvahd-Regenerate-H-from-IDL.patch --- vlc-3.0.18/contrib/src/pthreads/0002-headers-dxvahd-Regenerate-H-from-IDL.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/pthreads/0002-headers-dxvahd-Regenerate-H-from-IDL.patch 2023-04-22 23:27:28.000000000 +0000 @@ -0,0 +1,25 @@ +From d12847294d570acc97790c7a02fb44a73850f347 Mon Sep 17 00:00:00 2001 +From: LIU Hao +Date: Sat, 18 Mar 2023 17:19:02 +0800 +Subject: [PATCH 2/2] headers/dxvahd: Regenerate H from IDL + +Signed-off-by: LIU Hao +--- + mingw-w64-headers/include/dxvahd.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mingw-w64-headers/include/dxvahd.h b/mingw-w64-headers/include/dxvahd.h +index aaff9400c..6bcd753dd 100644 +--- a/mingw-w64-headers/include/dxvahd.h ++++ b/mingw-w64-headers/include/dxvahd.h +@@ -344,6 +344,7 @@ typedef struct _DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE_DATA { + UINT RGB_Range : 1; + UINT YCbCr_Matrix : 1; + UINT YCbCr_xvYCC : 1; ++ UINT Reserved : 28; + } __C89_NAMELESSSTRUCTNAME; + UINT Value; + } __C89_NAMELESSUNIONNAME; +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.18/contrib/src/pthreads/rules.mak vlc-3.0.20/contrib/src/pthreads/rules.mak --- vlc-3.0.18/contrib/src/pthreads/rules.mak 2022-05-24 20:35:27.000000000 +0000 +++ vlc-3.0.20/contrib/src/pthreads/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -11,12 +11,12 @@ ifndef HAVE_VISUALSTUDIO PKGS += dxva dxvahd PKGS_ALL += dxva dxvahd -ifeq ($(call mingw_at_least, 8), true) -PKGS_FOUND += dxvahd -endif # MINGW 8 ifeq ($(call mingw_at_least, 10), true) PKGS_FOUND += dxva endif # MINGW 10 +ifeq ($(call mingw_at_least, 11), true) +PKGS_FOUND += dxvahd +endif # MINGW 11 ifeq ($(HAVE_WINPTHREAD),) PKGS_FOUND += pthreads endif @@ -35,6 +35,8 @@ # pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-pthreads pthreads: mingw-w64-$(MINGW64_HASH).tar.xz .sum-pthreads $(UNPACK) + $(APPLY) $(SRC)/pthreads/0001-headers-Update-to-Wine-master-and-regenerate-H-from-.patch + $(APPLY) $(SRC)/pthreads/0002-headers-dxvahd-Regenerate-H-from-IDL.patch $(MOVE) .pthreads: pthreads diff -Nru vlc-3.0.18/contrib/src/qt/0019-QFileSystemEngine-only-define-FILE_ID_INFO-for-build.patch vlc-3.0.20/contrib/src/qt/0019-QFileSystemEngine-only-define-FILE_ID_INFO-for-build.patch --- vlc-3.0.18/contrib/src/qt/0019-QFileSystemEngine-only-define-FILE_ID_INFO-for-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/qt/0019-QFileSystemEngine-only-define-FILE_ID_INFO-for-build.patch 2023-04-22 23:27:28.000000000 +0000 @@ -0,0 +1,36 @@ +From fc4a82f9ba5dd31405b0615ed967c215277cf15e Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 13 Apr 2023 06:13:36 +0200 +Subject: [PATCH 19/19] QFileSystemEngine: only define FILE_ID_INFO for builds + before Win8 + +Otherwise it redefines a known structure and gives error with gcc 12. + +A similar change was done in 4879bc91d421714508fb54d095d9b0104d62d842 but +it was assuming the minimum build was Vista (not our case). + +Change-Id: I6befe6e348f36e01415cdc2817be98b07be23efb +--- + src/corelib/io/qfilesystemengine_win.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp +index 257bd4a50e..cf5092fec1 100644 +--- a/src/corelib/io/qfilesystemengine_win.cpp ++++ b/src/corelib/io/qfilesystemengine_win.cpp +@@ -625,10 +625,12 @@ typedef struct _FILE_ID_128 { + } FILE_ID_128, *PFILE_ID_128; + # endif // !(Q_CC_MINGW && FILE_SUPPORTS_INTEGRITY_STREAMS) + ++# if _WIN32_WINNT < 0x0602 // Windows 8 onwards + typedef struct _FILE_ID_INFO { + ULONGLONG VolumeSerialNumber; + FILE_ID_128 FileId; + } FILE_ID_INFO, *PFILE_ID_INFO; ++# endif + # endif // if defined (Q_CC_MINGW) || (defined(Q_CC_MSVC) && (_MSC_VER < 1700 || WINVER <= 0x0601)) + + // File ID for Windows up to version 7. +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.18/contrib/src/qt/rules.mak vlc-3.0.20/contrib/src/qt/rules.mak --- vlc-3.0.18/contrib/src/qt/rules.mak 2022-08-24 17:42:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/qt/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -40,6 +40,7 @@ $(APPLY) $(SRC)/qt/0016-Replace-custom-type-traits-with-std-one-s.patch $(APPLY) $(SRC)/qt/0017-Rename-QtPrivate-is_-un-signed-to-QtPrivate-Is-Un-si.patch $(APPLY) $(SRC)/qt/0018-Remove-qtypetraits.h-s-contents-altogether.patch + $(APPLY) $(SRC)/qt/0019-QFileSystemEngine-only-define-FILE_ID_INFO-for-build.patch $(APPLY) $(SRC)/qt/systray-no-sound.patch $(MOVE) diff -Nru vlc-3.0.18/contrib/src/smb2/rules.mak vlc-3.0.20/contrib/src/smb2/rules.mak --- vlc-3.0.18/contrib/src/smb2/rules.mak 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/smb2/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,6 +1,6 @@ # SMB2 SMB2_VERSION := 4.0.0 -SMB2_URL := https://github.com/sahlberg/libsmb2/archive/v$(SMB2_VERSION).tar.gz +SMB2_URL := $(GITHUB)/sahlberg/libsmb2/archive/v$(SMB2_VERSION).tar.gz ifeq ($(call need_pkg,"smb2"),) PKGS_FOUND += smb2 diff -Nru vlc-3.0.18/contrib/src/soxr/aarch64.patch vlc-3.0.20/contrib/src/soxr/aarch64.patch --- vlc-3.0.18/contrib/src/soxr/aarch64.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/soxr/aarch64.patch 2023-05-08 07:32:55.000000000 +0000 @@ -0,0 +1,21 @@ +diff --git a/cmake/Modules/FindSIMD32.cmake b/cmake/Modules/FindSIMD32.cmake +index 9e4237358f..580e9ca87b 100644 +--- a/cmake/Modules/FindSIMD32.cmake ++++ b/cmake/Modules/FindSIMD32.cmake +@@ -24,6 +24,16 @@ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + return !vgetq_lane_u32(vceqq_f32(a,b),0); + } + ") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") ++ set (TRIAL_C_FLAGS ++ " ") ++ set (TEST_C_SOURCE " ++ #include ++ int main(int c, char * * v) { ++ float32x4_t a = vdupq_n_f32((float)c), b = vdupq_n_f32((float)!!v); ++ return !vgetq_lane_u32(vceqq_f32(a,b),0); ++ } ++ ") + else () + if (WIN32) # Safety for when mixed lib/app compilers (but performance hit) + set (GCC_WIN32_SIMD32_OPTS "-mincoming-stack-boundary=2") diff -Nru vlc-3.0.18/contrib/src/soxr/rules.mak vlc-3.0.20/contrib/src/soxr/rules.mak --- vlc-3.0.18/contrib/src/soxr/rules.mak 2021-01-17 20:31:01.000000000 +0000 +++ vlc-3.0.20/contrib/src/soxr/rules.mak 2023-05-08 07:32:55.000000000 +0000 @@ -20,6 +20,7 @@ $(APPLY) $(SRC)/soxr/0003-add-aarch64-support.patch $(APPLY) $(SRC)/soxr/0004-arm-fix-SIGILL-when-doing-divisions-on-some-old-arch.patch $(APPLY) $(SRC)/soxr/find_ff_pkgconfig.patch + $(APPLY) $(SRC)/soxr/aarch64.patch $(call pkg_static,"src/soxr.pc.in") $(MOVE) diff -Nru vlc-3.0.18/contrib/src/sparkle/rules.mak vlc-3.0.20/contrib/src/sparkle/rules.mak --- vlc-3.0.18/contrib/src/sparkle/rules.mak 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/contrib/src/sparkle/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # Sparkle SPARKLE_VERSION := 1.16.0 -SPARKLE_URL := https://github.com/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).zip +SPARKLE_URL := $(GITHUB)/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).zip ifdef HAVE_MACOSX PKGS += sparkle diff -Nru vlc-3.0.18/contrib/src/spatialaudio/rules.mak vlc-3.0.20/contrib/src/spatialaudio/rules.mak --- vlc-3.0.18/contrib/src/spatialaudio/rules.mak 2021-01-17 20:31:01.000000000 +0000 +++ vlc-3.0.20/contrib/src/spatialaudio/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # Spatialaudio SPATIALAUDIO_VERSION := 0.3.0 -SPATIALAUDIO_URL = https://github.com/videolabs/libspatialaudio/releases/download/$(SPATIALAUDIO_VERSION)/spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 +SPATIALAUDIO_URL = $(GITHUB)/videolabs/libspatialaudio/releases/download/$(SPATIALAUDIO_VERSION)/spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 DEPS_spatialaudio = zlib mysofa diff -Nru vlc-3.0.18/contrib/src/upnp/fix-reuseaddr-option.patch vlc-3.0.20/contrib/src/upnp/fix-reuseaddr-option.patch --- vlc-3.0.18/contrib/src/upnp/fix-reuseaddr-option.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/upnp/fix-reuseaddr-option.patch 2023-08-05 10:03:51.000000000 +0000 @@ -0,0 +1,51 @@ +diff -ru upnp/upnp/src/ssdp/ssdp_server.c upnp-fixed/upnp/src/ssdp/ssdp_server.c +--- upnp/upnp/src/ssdp/ssdp_server.c 2022-08-03 16:05:12 ++++ upnp-fixed/upnp/src/ssdp/ssdp_server.c 2023-05-11 12:13:42 +@@ -928,6 +928,7 @@ + + return UPNP_E_OUTOF_SOCKET; + } ++#ifdef UPNP_MINISERVER_REUSEADDR + onOff = 1; + ret = setsockopt(*ssdpSock, + SOL_SOCKET, +@@ -945,6 +946,7 @@ + ret = UPNP_E_SOCKET_ERROR; + goto error_handler; + } ++#endif + #if (defined(BSD) && !defined(__GNU__)) || defined(__APPLE__) + onOff = 1; + ret = setsockopt(*ssdpSock, +@@ -1133,6 +1135,7 @@ + return UPNP_E_OUTOF_SOCKET; + } + onOff = 1; ++#ifdef UPNP_MINISERVER_REUSEADDR + ret = setsockopt(*ssdpSock, + SOL_SOCKET, + SO_REUSEADDR, +@@ -1149,6 +1152,7 @@ + ret = UPNP_E_SOCKET_ERROR; + goto error_handler; + } ++#endif + #if (defined(BSD) && !defined(__GNU__)) || defined(__APPLE__) + onOff = 1; + ret = setsockopt(*ssdpSock, +@@ -1313,6 +1317,7 @@ + return UPNP_E_OUTOF_SOCKET; + } + onOff = 1; ++#ifdef UPNP_MINISERVER_REUSEADDR + ret = setsockopt(*ssdpSock, + SOL_SOCKET, + SO_REUSEADDR, +@@ -1329,6 +1334,7 @@ + ret = UPNP_E_SOCKET_ERROR; + goto error_handler; + } ++#endif + #if (defined(BSD) && !defined(__GNU__)) || defined(__APPLE__) + onOff = 1; + ret = setsockopt(*ssdpSock, diff -Nru vlc-3.0.18/contrib/src/upnp/rules.mak vlc-3.0.20/contrib/src/upnp/rules.mak --- vlc-3.0.18/contrib/src/upnp/rules.mak 2022-09-22 18:08:33.000000000 +0000 +++ vlc-3.0.20/contrib/src/upnp/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -24,8 +24,12 @@ ifdef HAVE_WINSTORE UPNP_CONF += --disable-ipv6 --enable-unspecified_server else +ifdef HAVE_IOS +UPNP_CONF += --disable-ipv6 --disable-reuseaddr +else UPNP_CONF += --enable-ipv6 endif +endif ifndef WITH_OPTIMIZATION UPNP_CONF += --enable-debug endif @@ -49,6 +53,9 @@ $(APPLY) $(SRC)/upnp/revert-ifaddrs.patch endif $(APPLY) $(SRC)/upnp/miniserver.patch +ifdef HAVE_IOS + $(APPLY) $(SRC)/upnp/fix-reuseaddr-option.patch +endif $(UPDATE_AUTOCONFIG) $(MOVE) diff -Nru vlc-3.0.18/contrib/src/vncclient/rules.mak vlc-3.0.20/contrib/src/vncclient/rules.mak --- vlc-3.0.18/contrib/src/vncclient/rules.mak 2021-07-06 21:47:27.000000000 +0000 +++ vlc-3.0.20/contrib/src/vncclient/rules.mak 2023-08-05 10:03:51.000000000 +0000 @@ -1,7 +1,7 @@ # vncclient VNCCLIENT_VERSION := 0.9.10 -VNCCLIENT_URL := https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz +VNCCLIENT_URL := $(GITHUB)/LibVNC/libvncserver/archive/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz ifdef GPL ifdef BUILD_NETWORK diff -Nru vlc-3.0.18/contrib/src/vpx/SHA512SUMS vlc-3.0.20/contrib/src/vpx/SHA512SUMS --- vlc-3.0.18/contrib/src/vpx/SHA512SUMS 2022-08-24 17:42:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/vpx/SHA512SUMS 2023-09-30 09:37:16.000000000 +0000 @@ -1 +1 @@ -dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0 libvpx-1.12.0.tar.gz +49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897 libvpx-1.13.1.tar.gz diff -Nru vlc-3.0.18/contrib/src/vpx/libvpx-android.patch vlc-3.0.20/contrib/src/vpx/libvpx-android.patch --- vlc-3.0.18/contrib/src/vpx/libvpx-android.patch 2020-10-24 18:21:13.000000000 +0000 +++ vlc-3.0.20/contrib/src/vpx/libvpx-android.patch 2023-04-22 23:27:28.000000000 +0000 @@ -1,6 +1,6 @@ -diff -ruw libvpx-1.9.0.orig/vpx_ports/vpx_ports.mk libvpx-1.9.0/vpx_ports/vpx_ports.mk ---- libvpx-1.9.0.orig/vpx_ports/vpx_ports.mk 2020-07-30 15:59:15.000000000 -0400 -+++ libvpx-1.9.0/vpx_ports/vpx_ports.mk 2020-08-31 22:29:18.638262049 -0400 +diff -ruw libvpx-1.13.0/vpx_ports/vpx_ports.mk libvpx-1.13.0-new/vpx_ports/vpx_ports.mk +--- libvpx-1.13.0/vpx_ports/vpx_ports.mk 2023-02-07 20:33:51.000000000 -0500 ++++ libvpx-1.13.0-new/vpx_ports/vpx_ports.mk 2023-03-24 11:42:44.133675374 -0400 @@ -37,6 +37,7 @@ endif @@ -9,9 +9,9 @@ PORTS_SRCS-$(VPX_ARCH_ARM) += arm.h PORTS_SRCS-$(VPX_ARCH_PPC) += ppc_cpudetect.c -diff -ruw libvpx-1.9.0.orig/vpx_ports/x86_abi_support.asm libvpx-1.9.0/vpx_ports/x86_abi_support.asm ---- libvpx-1.9.0.orig/vpx_ports/x86_abi_support.asm 2020-07-30 15:59:15.000000000 -0400 -+++ libvpx-1.9.0/vpx_ports/x86_abi_support.asm 2020-08-31 22:29:16.846269764 -0400 +diff -ruw libvpx-1.13.0/vpx_ports/x86_abi_support.asm libvpx-1.13.0-new/vpx_ports/x86_abi_support.asm +--- libvpx-1.13.0/vpx_ports/x86_abi_support.asm 2023-03-24 11:46:57.104724909 -0400 ++++ libvpx-1.13.0-new/vpx_ports/x86_abi_support.asm 2023-03-24 11:47:48.824529092 -0400 @@ -414,6 +414,7 @@ ; On Android platforms use lrand48 when building postproc routines. Prior to L diff -Nru vlc-3.0.18/contrib/src/vpx/libvpx-darwin-aarch64.patch vlc-3.0.20/contrib/src/vpx/libvpx-darwin-aarch64.patch --- vlc-3.0.18/contrib/src/vpx/libvpx-darwin-aarch64.patch 2020-10-24 18:21:13.000000000 +0000 +++ vlc-3.0.20/contrib/src/vpx/libvpx-darwin-aarch64.patch 2023-04-22 23:27:28.000000000 +0000 @@ -1,15 +1,15 @@ ---- ./build/make/configure.sh.original 2020-08-10 15:46:20.000000000 +0200 -+++ ./build/make/configure.sh 2020-08-10 15:54:53.000000000 +0200 -@@ -996,7 +996,7 @@ EOF +--- libvpx-1.13.0/build/make/configure.sh 2023-02-07 20:33:51.000000000 -0500 ++++ libvpx-1.13.0-new/build/make/configure.sh 2023-03-24 11:41:25.477967730 -0400 +@@ -1119,7 +1119,7 @@ - darwin*) + darwin) if ! enabled external_build; then - XCRUN_FIND="xcrun --sdk iphoneos --find" + XCRUN_FIND="xcrun --find" CXX="$(${XCRUN_FIND} clang++)" CC="$(${XCRUN_FIND} clang)" AR="$(${XCRUN_FIND} ar)" -@@ -1015,7 +1015,7 @@ EOF +@@ -1138,7 +1138,7 @@ add_cflags -arch ${tgt_isa} add_ldflags -arch ${tgt_isa} diff -Nru vlc-3.0.18/contrib/src/vpx/libvpx-ios.patch vlc-3.0.20/contrib/src/vpx/libvpx-ios.patch --- vlc-3.0.18/contrib/src/vpx/libvpx-ios.patch 2022-08-24 17:42:00.000000000 +0000 +++ vlc-3.0.20/contrib/src/vpx/libvpx-ios.patch 2023-04-22 23:27:28.000000000 +0000 @@ -1,11 +1,12 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 581042e38..5b282d666 100644 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -861,100 +861,6 @@ process_common_toolchain() { - # PIC is probably what we want when building shared libs - enabled shared && soft_enable pic +--- libvpx-1.13.0/build/make/configure.sh 2023-02-07 20:33:51.000000000 -0500 ++++ libvpx-1.13.0-new/build/make/configure.sh 2023-03-24 11:22:57.841614048 -0400 +@@ -858,103 +858,6 @@ + ;; + esac +- # PIC is probably what we want when building shared libs +- enabled shared && soft_enable pic +- - # Minimum iOS version for all target platforms (darwin and iphonesimulator). - # Shared library framework builds are only possible on iOS 8 and later. - if enabled shared; then @@ -85,7 +86,7 @@ - add_cflags "-mmacosx-version-min=10.15" - add_ldflags "-mmacosx-version-min=10.15" - ;; -- *-darwin2[0-1]-*) +- *-darwin2[0-2]-*) - add_cflags "-arch ${toolchain%%-*}" - add_ldflags "-arch ${toolchain%%-*}" - ;; @@ -103,7 +104,7 @@ # Handle Solaris variants. Solaris 10 needs -lposix4 case ${toolchain} in sparc-solaris-*) -@@ -1143,12 +1049,6 @@ EOF +@@ -1143,12 +1046,6 @@ add_cflags -isysroot ${alt_libc} fi diff -Nru vlc-3.0.18/contrib/src/vpx/rules.mak vlc-3.0.20/contrib/src/vpx/rules.mak --- vlc-3.0.18/contrib/src/vpx/rules.mak 2022-09-22 18:08:33.000000000 +0000 +++ vlc-3.0.20/contrib/src/vpx/rules.mak 2023-09-30 09:37:33.000000000 +0000 @@ -1,7 +1,7 @@ # libvpx -VPX_VERSION := 1.12.0 -VPX_URL := http://github.com/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz +VPX_VERSION := 1.13.1 +VPX_URL := $(GITHUB)/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz PKGS += vpx ifeq ($(call need_pkg,"vpx >= 1.5.0"),) diff -Nru vlc-3.0.18/contrib/src/zlib/SHA512SUMS vlc-3.0.20/contrib/src/zlib/SHA512SUMS --- vlc-3.0.18/contrib/src/zlib/SHA512SUMS 2022-05-28 20:21:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/zlib/SHA512SUMS 2023-01-01 22:21:52.000000000 +0000 @@ -1 +1 @@ -cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 zlib-1.2.12.tar.gz +9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725 zlib-1.2.13.tar.xz diff -Nru vlc-3.0.18/contrib/src/zlib/rules.mak vlc-3.0.20/contrib/src/zlib/rules.mak --- vlc-3.0.18/contrib/src/zlib/rules.mak 2022-05-28 20:21:20.000000000 +0000 +++ vlc-3.0.20/contrib/src/zlib/rules.mak 2023-08-02 16:13:00.000000000 +0000 @@ -1,6 +1,6 @@ # ZLIB -ZLIB_VERSION := 1.2.12 -ZLIB_URL := https://www.zlib.net/zlib-$(ZLIB_VERSION).tar.gz +ZLIB_VERSION := 1.2.13 +ZLIB_URL := $(GITHUB)/madler/zlib/releases/download/v$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.xz PKGS += zlib ifeq ($(call need_pkg,"zlib"),) @@ -13,12 +13,12 @@ endif endif -$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz: +$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.xz: $(call download_pkg,$(ZLIB_URL),zlib) -.sum-zlib: zlib-$(ZLIB_VERSION).tar.gz +.sum-zlib: zlib-$(ZLIB_VERSION).tar.xz -zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib +zlib: zlib-$(ZLIB_VERSION).tar.xz .sum-zlib $(UNPACK) $(APPLY) $(SRC)/zlib/no-shared.patch $(MOVE) diff -Nru vlc-3.0.18/debian/changelog vlc-3.0.20/debian/changelog --- vlc-3.0.18/debian/changelog 2022-12-02 21:08:18.000000000 +0000 +++ vlc-3.0.20/debian/changelog 2023-11-01 23:13:56.000000000 +0000 @@ -1,3 +1,10 @@ +vlc (3.0.20-0+deb11u1) bullseye-security; urgency=medium + + * New upstream version 3.0.19 + - Fix potential security issue (OOB Write) on MMS:// + + -- Sebastian Ramacher Thu, 02 Nov 2023 00:13:56 +0100 + vlc (3.0.18-0+deb11u1) bullseye-security; urgency=medium * New upstream version 3.0.18 diff -Nru vlc-3.0.18/debian/patches/0001-configure-fix-linking-on-RISC-V-ISA.patch vlc-3.0.20/debian/patches/0001-configure-fix-linking-on-RISC-V-ISA.patch --- vlc-3.0.18/debian/patches/0001-configure-fix-linking-on-RISC-V-ISA.patch 2022-12-02 21:07:09.000000000 +0000 +++ vlc-3.0.20/debian/patches/0001-configure-fix-linking-on-RISC-V-ISA.patch 2023-11-01 23:13:43.000000000 +0000 @@ -6,9 +6,11 @@ configure.ac | 1 + 1 file changed, 1 insertion(+) +diff --git a/configure.ac b/configure.ac +index 2037a9e..df26367 100644 --- a/configure.ac +++ b/configure.ac -@@ -113,6 +113,7 @@ +@@ -113,6 +113,7 @@ case "${host_os}" in ;; linux*) SYS=linux diff -Nru vlc-3.0.18/doc/ChangeLog-2003 vlc-3.0.20/doc/ChangeLog-2003 --- vlc-3.0.18/doc/ChangeLog-2003 2022-08-03 11:59:20.000000000 +0000 +++ vlc-3.0.20/doc/ChangeLog-2003 2023-08-29 05:09:39.000000000 +0000 @@ -22562,3 +22562,13 @@ i_bytes_per_frame and i_frame_length in each audio decoder. * src/audio_output/dec.c: proper fix to correctly set i_bytes_per_frame and i_frame_length. + +commit 08f42608b73bdc422eed24cf0915888417ff5a38 +Author: Jon Lech Johansen +Date: Wed Jan 1 11:14:50 2003 +0000 + + * ./modules/gui/macosx/aout.m: cleaned up the code, removed intf dep. + * ./src/misc/darwin_specific.m: fixed segfault (o_enumerator was being + released twice) and memory leak. + + Bonne Ann�e! diff -Nru vlc-3.0.18/doc/ChangeLog-2014 vlc-3.0.20/doc/ChangeLog-2014 --- vlc-3.0.18/doc/ChangeLog-2014 2022-08-03 11:59:21.000000000 +0000 +++ vlc-3.0.20/doc/ChangeLog-2014 2023-08-29 05:09:41.000000000 +0000 @@ -28355,3 +28355,9 @@ Date: Wed Jan 1 17:57:26 2014 +0200 Remove stray comment + +commit 33d54e40ebfc58ecffe482a25f817c0b550c63b9 +Author: Jean-Baptiste Kempf +Date: Wed Jan 1 11:31:17 2014 +0100 + + Happy New Year 2014! diff -Nru vlc-3.0.18/doc/ChangeLog-2022 vlc-3.0.20/doc/ChangeLog-2022 --- vlc-3.0.18/doc/ChangeLog-2022 2022-08-03 11:59:21.000000000 +0000 +++ vlc-3.0.20/doc/ChangeLog-2022 2023-08-29 05:09:41.000000000 +0000 @@ -1,3 +1,1982 @@ +commit 4585d552506e8ef4b18e4619887c3b38f065bcc0 +Author: Jean-Baptiste Kempf +Date: Sun Dec 25 19:42:17 2022 +0100 + + On the road to 3.0.19 + +commit 379c00bd422ed73dae4e7efbcf0176e6f5d37b02 +Author: Francois Cartegnie +Date: Tue Dec 27 21:31:11 2022 +0100 + + demux: mp4: fix bogus edit list timescale + + regression after 0aecdcabaa27f32dc1e3de1832d22d9766cdfae6 + + refs #27669 + +commit 062db58dccb0f5292eb4a3fd94df0128d9403ffc +Author: Francois Cartegnie +Date: Tue Dec 13 16:56:27 2022 +0100 + + codec: jpeg: check every APP1 for orientation + + (cherry picked from commit a0d6edda54b329649c50b7de8c97b1509990fd20) + +commit 9b9cbf2b78ea83141e080310edf796a5f305b2c4 +Author: Francois Cartegnie +Date: Tue Dec 13 16:55:44 2022 +0100 + + codec: jpeg: use native readers + + (cherry picked from commit d80b8049b7ce2c05bf18397a951340668a3a9ced) + +commit 88d5ca55e1ccb618322c82e41db646979bb60994 +Author: Francois Cartegnie +Date: Tue Dec 13 16:49:47 2022 +0100 + + codec: jpeg: constify + + (cherry picked from commit 1a82010c9665ad449fe48545e5c1522bb89e67e1) + +commit 2acd447486c2607b4e7f14af1b0fd97e8f505bf0 +Author: Francois Cartegnie +Date: Tue Dec 13 16:28:53 2022 +0100 + + codec: jpeg: check projection values + + (cherry picked from commit 4e419fa5266a5574908a4cf6146c12e3c56a0e86) + +commit 0118f97cfbd35e8827db40a3501eb7b9414655bf +Author: Francois Cartegnie +Date: Tue Dec 13 16:16:55 2022 +0100 + + codec: jpeg: search every APP1 for XMP projection tag + + (cherry picked from commit 7c3130c951840972229b265f8de5679a543d324f) + +commit ab66dd1ffd5cbe74b9dfe1b683800562fa1867a2 +Author: Francois Cartegnie +Date: Tue Dec 13 16:17:46 2022 +0100 + + demux: image: fix probing jpeg starting with XMP + + (cherry picked from commit 1c6749b8090a659678ff1cdbd80358405efac3f3) + +commit 9b3b296d0e17f04ce4936fad9c4ef36a75b248d9 +Author: Francois Cartegnie +Date: Tue Dec 13 20:11:22 2022 +0100 + + demux: image: use proper type for peek + + (cherry picked from commit 8b310b2fd572dc54356dac1393bd4c14bfef6532) + +commit 22ae743f385c7443a8531643c3154fdcc6a2767f +Author: Francois Cartegnie +Date: Mon Dec 19 14:23:42 2022 +0100 + + demux: image: fix jpeg probe size return check + + valid jpeg data offset being greater than 0xff + + (cherry picked from commit a0e6c1758586a1b98a0100507a3f0c47839050c1) + +commit da33263b12c9814da922234a3734c393c89345fa +Author: Francois Cartegnie +Date: Thu Dec 22 14:43:40 2022 +0100 + + demux: mp4: do not flag discontinuity after empty edit + + refs #26943 + + (cherry picked from commit 203fb201da9c44bf5d68c937a071f5a8f25fda2f) + +commit 25fc2f30d94b00de153a0d661ac24487494d3f21 +Author: Francois Cartegnie +Date: Thu Dec 22 14:57:04 2022 +0100 + + demux: mp4: elst can only change if there's one + + (cherry picked from commit 0e3d3c060b34a703e68fa3dbfd313bda02067dad) + +commit 2def5869420bce69449f45ae5206122899a8f2ca +Author: Francois Cartegnie +Date: Mon Oct 14 21:00:21 2019 +0200 + + demux: avi: fix playback of flipped rgb (refs #22915) + + (cherry picked from commit 99a193f6d9639220e5bcebb23585d7e26651a2c4) + +commit 4c17c93064d9f72bb2788e2c367d117a0f185865 +Author: Francois Cartegnie +Date: Mon Oct 14 20:37:06 2019 +0200 + + demux: avi: add more comments + + (cherry picked from commit 5be2d51811ed48c596069a7799199b9a99af7729) + +commit 76b0bb360176be09a6da9aa7cd3a116e763a14bf +Author: Francois Cartegnie +Date: Mon Oct 14 20:36:15 2019 +0200 + + demux: avi: int_max is flipped range + + (cherry picked from commit 0d2b0a46700b9aa363d0d76e508c63e17420996e) + +commit 2d789162d57284bf849aa2c5df3100f57a4f6acf +Author: Francois Cartegnie +Date: Mon Oct 14 20:37:21 2019 +0200 + + demux: avi: fix conversion + + (cherry picked from commit 52ce937c7faf4c348f740157b2ed880cd79b680a) + +commit 912a396a970805504b30b93c2d677be3bf08aea8 +Author: Francois Cartegnie +Date: Mon Oct 14 20:57:17 2019 +0200 + + demux: avi: fix debug height for flipped planes (fix #22915) + + (cherry picked from commit 136fd86090b11ba6d89e46e16e8f7474d4451e2f) + +commit 6183d1e1530e5fee926a4fbbae8fe8628a2bcd57 +Author: Francois Cartegnie +Date: Wed Dec 7 22:14:05 2022 +0100 + + demux: ogg: fix last page probing + + properly process the full search window instead of returning the first page found + + change lower search range stop condition to fix parsing bug on lowest + window + + refs #27610 + + (cherry picked from commit efcb930b250de59dbaad59a4e5364292a32188b1) + +commit 767b44f0e417015f29b8a8fff1d04f2b41162d30 +Author: Steve Lhomme +Date: Mon Sep 12 10:15:56 2022 +0200 + + contrib: fluidlite: update the hash to allow out of tree builds + + (cherry picked from commit 1c7fdece821cf164de744ade04a016b364cf9f32) + + This fixes #25327. + +commit 4d46246f4aec36a0f749da870af04606a7b3e4e5 +Author: Tristan Matthews +Date: Thu Sep 17 15:03:14 2020 -0400 + + contrib: daala: update upstream URL + + (cherry picked from commit 38523115cb430eefda1fe75d1f34d25a75fad546) + +commit 60771fe71284849d5be58b782ff11733176c6746 +Author: Eugene Popov +Date: Sat Dec 3 18:22:11 2022 +0000 + + [3.0] Fix the playback bar is shown when the player window is inactive on Linux + +commit 93523e6e108a00ec4941101d5e877eea04046207 +Author: Alexandre Janniaux +Date: Wed Dec 15 16:20:41 2021 +0100 + + modules: fix typos + + Typos found and reworked from codespell. + + (cherry picked from commit 6b7a57f9847fef77c687da8c63afa99328c74da2) (edited) + edited: + * some files don't exist in 3.0 + * some 3.0 code around changes is different (vlc_tick_t) + + Signed-off-by: Steve Lhomme + +commit c2dd4bfefe079e49db1789eb76be3885e4fc31b4 +Author: Francois Cartegnie +Date: Mon Nov 7 15:02:57 2022 +0100 + + packetizer: flac: fix CRC from emulated sync + + also skips some memcpy + + refs #27454 #27477 + + (cherry picked from commit c14b5aa6a7bd3aa25fa951e2b4136aff70f5702a) + +commit e264d5b6af7ac3b09ae656c9700c0e8e966e570e +Author: Steve Lhomme +Date: Mon Jul 2 15:52:19 2018 +0200 + + rename VLC_TS_0 to VLC_TICK_0 + + (cherry picked from commit ded62a069f457ae919fae30b60d920a8ac3c92b4) (edited) + edited: + * some of the 3.0 code was different + +commit 0b4dff80ac381dd7de75125c70145a206a01eed8 +Author: Steve Lhomme +Date: Mon Jul 2 15:51:29 2018 +0200 + + rename VLC_TS_INVALID to VLC_TICK_INVALID + + (cherry picked from commit 1f17997348e5b5bb039647515c5ea54025bb81d5) (edited) + edited: + * some of the 3.0 code was different + +commit 3f9fc44176cc5505132977885799fa988c5e7701 +Author: Steve Lhomme +Date: Fri Jun 22 13:19:24 2018 +0200 + + rename mtime_t to vlc_tick_t + + Keep a copy of vlc_tick_tfor backward compatibility. + + (cherry picked from commit ff56c92a5ed62d713fb9842f36494a2e9d90fc6f) (edited) + edited: + * some of the 3.0 code is different + +commit 8179b10e7e692955a972f59ba50f3b51464d3854 +Author: Rémi Denis-Courmont +Date: Tue Jan 18 22:31:55 2022 +0200 + + contrib: do not require gtkdocize + + This unbreaks packages using autoreconf. + + (cherry picked from commit 7beb060516a8ce8a4ad4abf26aade3e3344f9ecd) + + Signed-off-by: Steve Lhomme + +commit b64b9c224bc69e5a2803c7cdbe8d83a65303cf15 +Author: Marvin Scholz +Date: Mon Nov 7 12:02:28 2022 +0100 + + macosx: fix possible SPMediaKeyTap crash + + Adding nil to an NSArray would make it raise an + NSInvalidArgumentException which in turn leads to an abort in + dispatch_once: + https://github.com/apple-oss-distributions/libdispatch/blob/55c3a68e9ec47f1c1d5bb9909404ce5f0351edef/src/object.m#L557 + + Fix #27487 + + (cherry picked from commit 41ec80a1282ba01d82e7954530e1d9ab8e14e415) + Signed-off-by: Marvin Scholz + +commit 8bf904652304e9563d49a98d418e71e59bf4581e +Author: Marvin Scholz +Date: Wed Nov 16 06:42:24 2022 +0100 + + control: dbus: emit CanPlay consistently + + When VLC was launched from a file, the handling for playlist + change events was not sufficient as in case of starting with + a file, we could miss the event and never report CanPlay. + + When playing a file from a service discovery, like our Lua + web parser scripts, this logic was flawed too, as the playlist + would always be "empty" even though we are clearly currently + paused on an input. To fix that, check if CanPlay disagrees + with reality when we get an input change and emit CanPlay. + + There is no check added in the item append/delete sections, + so currently once an item from an SD is played, even when + the user has switched back to the main playlist, the status + would still be CanPlay until and item is added or removed + in the "main" playlist. However this exactly matches how the + Qt interface behaves, so I've left this behavior as-is for + consistency with the interface. + + Fix #21419 + Fix #22785 + +commit 1c037bc66975e24e68760a4e91b7ecd700d4efd2 +Author: Marvin Scholz +Date: Wed Nov 16 06:18:53 2022 +0100 + + control: dbus: emit events properly on input change + + The can-seek and can-pause variables could end up + not being set, as the callback events are not reliably + fired in case the variables changed before the callbacks + are attached. + Additionally we need to report the playback status properly + whenever a new item starts playing. + + Fix #24699 + +commit 94035013a041e1e2590059e8801f2b39c025146a +Author: David Fuhrmann +Date: Thu Nov 24 20:19:41 2022 +0100 + + contribs: growl: Replace CFNetwork with CoreServices framework for intel builds + + CFNetwork library is automatically added by recent SDKs. By replacing + this framework with CoreServices.framework, we retain support for Mac OSX 10.7. + +commit b36269203ee5aa011bda5877f2e1e7725b237157 +Author: David Fuhrmann +Date: Wed Nov 23 21:53:21 2022 +0100 + + macosx/build.sh: Replace CFNetwork with CoreServices framework for intel builds + + CFNetwork library is automatically added by recent SDKs. By replacing + this framework with CoreServices.framework, we retain support for Mac OS + X 10.7. + +commit 52df7ff818cc517a55220c6b89017fe51404c7c3 +Author: Pierre Ynard +Date: Fri Nov 18 06:17:50 2022 +0100 + + youtube.lua: update for player config definition site change + + Fixes #27529 + + (cherry picked from commit a0b3c43815328dd5e73485f912ee2fb9e46bfb4a) + + Signed-off-by: Steve Lhomme + +commit bbf81b68838f2b4aead0c8977b2ac1eff39a2bbc +Author: Zhao Zhili +Date: Fri Jun 29 17:46:07 2018 +0800 + + prefetch: handle STREAM_GET_TAGS + + Signed-off-by: Thomas Guillem + (cherry picked from commit c53aefcc786e9022a571a27fb4c694d8bb571d1b) + Signed-off-by: Marvin Scholz + +commit 0a33447a72c8b2aefcfc9af2a9e1d53306cff3e8 +Author: Alexandre Janniaux +Date: Wed Jan 27 13:00:23 2021 +0100 + + configure.ac: fix deprecated mention with newer autoconf + + (cherry picked from commit 7eb922bcb2cb9b4a023597a25871074c6fd9e42a) + Signed-off-by: Marvin Scholz + +commit cacf92f3d4c7af17d13a0074a7c18827a46295f6 +Author: Alexandre Janniaux +Date: Sat Jan 30 18:43:44 2021 +0100 + + configure.ac: fix AC_PROG_LEX warning + + With autoconf 2.70, the following warnings are emitted: + + configure.ac:56: warning: AC_PROG_LEX without either yywrap or noyywrap is obsolete + ./lib/autoconf/programs.m4:716: _AC_PROG_LEX is expanded from... + ./lib/autoconf/programs.m4:709: AC_PROG_LEX is expanded from... + configure.ac:56: the top level + + The documentation[1] of autoconf now states: + + > Prior to Autoconf 2.70, AC_PROG_LEX did not take any arguments, and + > its behavior was different from either of the above possibilities: it + > would search for a library that defines yywrap, and would set LEXLIB + > to that library if it finds one. However, if a library that defines + > this function could not be found, LEXLIB would be left empty and LEX + > would not be reset. This behavior was due to a bug, but several + > packages came to depend on it, so AC_PROG_LEX still does this if + > neither the yywrap nor the noyywrap option is given. + > + > Usage of AC_PROG_LEX without choosing one of the yywrap or noyywrap + > options is deprecated. It is usually better to use noyywrap and define + > the yywrap function yourself, as this almost always renders the LEXLIB + > unnecessary. + + The behaviour of the argument on autoconf < 2.70 is to ignore the + argument, so there are no issues with adding the option. + + [1] https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.70/html_node/Particular-Programs.html#Particular-Programs + + (cherry picked from commit 824b3d4551e6c19e34e31bedb6f8843cfda35ca0) + Signed-off-by: Marvin Scholz + +commit 638a07dba08b4e20c7e574288bc4bfdc770664ee +Author: Thomas Guillem +Date: Fri Nov 4 09:55:39 2022 +0100 + + audiounit_ios: don't fetch the output layout + + That way, we will always use MapInputLayout() on tvOS/iOS. + + (cherry picked from commit ebc27c6e4053a0a6dfe42a0d0acd89e394df1d2b) + Signed-off-by: Thomas Guillem + +commit d58a68dd2c85a7d30f9add2684e84e8f67a826f0 +Author: Thomas Guillem +Date: Fri Nov 4 09:55:11 2022 +0100 + + audiounit_ios: move debug log + + (cherry picked from commit cac29a174030fbdda0abb5537c7515e5750d2281) + Signed-off-by: Thomas Guillem + +commit 6eb4f99dbe6be0fb68ac4927fd82da3fa2a7ddc9 +Author: Thomas Guillem +Date: Fri Oct 28 13:18:07 2022 +0200 + + coreaudio: use ChannelDescriptions for MapInputLayout() + + Simpler, tested on tvOS 14 and 16. On tvOS, the device can adapt to the + VLC input format, in contrary to macOS. + + Fixes 7.1 surround. + + (cherry picked from commit 3d92b1c3017f45c6410dc0dde7b3e2095ce176d7) + Signed-off-by: Thomas Guillem + +commit 2edac7c59f40d89082e00c8bc16c0c1dca6f55b5 +Author: Thomas Guillem +Date: Fri Nov 4 09:46:51 2022 +0100 + + coreaudio: remove useless log + + There is one more complete just after. + + (cherry picked from commit 704d6fcfa0c9530a4461c62e61049e837ba080b0) + Signed-off-by: Thomas Guillem + +commit 8457f069d8e09baa9cab0588ce6e2230ea9c4c51 +Author: Thomas Guillem +Date: Thu Nov 3 16:54:02 2022 +0100 + + coreaudio: MapInputLayout() can now return any type of AudioChannelLayout + + (cherry picked from commit 28e4d7fe50b28cbc7267aa72ec0fa28a26924aa2) + Signed-off-by: Thomas Guillem + +commit 8e749c610a43d23075a736dab05fe2919984663c +Author: Thomas Guillem +Date: Thu Nov 3 16:18:26 2022 +0100 + + coreaudio: rename SetupInputLayout + + (cherry picked from commit c65da6381ac6a7b454115790ac933c7ece36cde8) + Signed-off-by: Thomas Guillem + +commit b344e73860ee08abb21a04b503c35800e6026f39 +Author: Thomas Guillem +Date: Thu Nov 3 15:20:53 2022 +0100 + + coreaudio: add Lsd/Rsd mapping + + Could not test it. + + (cherry picked from commit 082a0305f1765495e74e7650b07baf83e9e6eef3) + Signed-off-by: Thomas Guillem + +commit c3d728d5e7548f3c50da7f3a0c7ff93992f15a39 +Author: Thomas Guillem +Date: Thu Nov 3 15:04:38 2022 +0100 + + coreaudio: swap Surround with RearSurround when needed + + Tested on macOS 12.5, compared with the same vlc/sample/amplifier on + Windows. + + Surround and RearSurround are indeed swapped for 7.1, same for tvOS (cf. + next). + + But why ? + + (cherry picked from commit 0a65098fcd0d7ddc4c56fa10c616ddd044eeee32) + Signed-off-by: Thomas Guillem + +commit dc181df1164c69f39c833ead26856f66329809bf +Author: Thomas Guillem +Date: Thu Nov 3 14:49:37 2022 +0100 + + coreaudio: use a switch case instead of an array + + The current size of the array is 35 for 9 elements. + + The maximum value for AudioChannelLabel is 65536 and we want to avoid + having an array of 65536 for very few elements. + + (cherry picked from commit 9d676d26b39c8b571e76990eced97eead0b4dcb4) + Signed-off-by: Thomas Guillem + +commit ea9c30171d821dc5d066ff0a762ce5d4ebf256db +Author: Thomas Guillem +Date: Wed Nov 2 17:07:13 2022 +0100 + + coreaudio: either use output or input layout + + And not both. + + On macOS, VLC need to adapt its fmt to the output layout (it can't + change it). + on tvOS, VLC can send its custom input layout. + + Fixes #27474 + Also fix 7.1 mapping on macOS (Center was on Left...). + + (cherry picked from commit 87bbf8f272ef6b38b6ed1c002e96f570aba0f4a8) + Signed-off-by: Thomas Guillem + +commit 96cb65e37003bd6e97ae141157e4d6fa4b05f0b2 +Author: Thomas Guillem +Date: Fri Oct 28 13:24:09 2022 +0200 + + coreaudio: refactor aout_CheckChannelReorder() usage + + (cherry picked from commit 0405833cd8a5cafcccc5253f1e5a9b58b5471b26) + Signed-off-by: Thomas Guillem + +commit fd8b5163f215f8e11b0696e9ede83e1e3078998e +Author: Thomas Guillem +Date: Fri Oct 28 13:17:13 2022 +0200 + + coreaudio: fix layout tag mismatch for L R C Cs + + (cherry picked from commit 12683cccac45230ad10533d7357ff7a31f8c6253) + Signed-off-by: Thomas Guillem + +commit 20c96c575861f13bca51f30078600301d1f27237 +Author: Thomas Guillem +Date: Fri Oct 28 12:53:25 2022 +0200 + + coreaudio: fix original value never set + + Regression from 91f426996c98 + + This fixes the shortcut to map channels to Center or Stereo. + + (cherry picked from commit b73f7c40d8a8355f188d10ce919f90ecfaf745d7) + Signed-off-by: Thomas Guillem + +commit 921c47e26743bbceedf02df36a8441e6d853163a +Author: KO Myung-Hun +Date: Wed Oct 26 12:42:28 2022 +0900 + + cdrom: fix a typo + +commit 6e274f32227dde52565e0924ceb4773f296ad2ba +Author: Alexandre Janniaux +Date: Tue Mar 5 20:30:24 2019 +0100 + + faad: remove useless continue statement + + ... at the end of the loop. + + Signed-off-by: Hugo Beauzée-Luyssen + (cherry picked from commit 603ade4f5d01d03b240694992a596b3c5904148b) + +commit 24ebefda258ff577c02cd2ed150decff807fc798 +Author: Francois Cartegnie +Date: Thu Oct 20 16:41:02 2022 +0200 + + codec: faad: always init to TS_INVALID + + partial bp of 10318107ac248f2d9b1be038265f3d29a6734c97 + +commit 2c5a7264737caf020d7a3b781ed454b6108142df +Author: Lyndon Brown +Date: Sun Mar 17 06:59:19 2019 +0000 + + faad: check config validity + + the `NeAACDecSetConfiguration()` function copies attributes from the given + config object to the actual config held within the decoder context object. + it validates each config attribute before copying it, immediately returning + zero if the attribute is invalid. + + we should use the return value to check that our config was successfully + written. + + (cherry picked from commit 8beee731064750745667cf21b63394c04157dd35) + +commit d906e3e7b7be0b09065a626a0a692a9f0609fc7c +Author: Francois Cartegnie +Date: Fri Oct 11 19:34:59 2019 +0200 + + codec: faad: workaround unaligned timings + + (cherry picked from commit c8d7729ae6f3663a5cfde12fb0c185e2a3972461) + +commit 3bfe4f14a396d5ff7aae01f0f7113580d6182993 +Author: Francois Cartegnie +Date: Thu Feb 21 20:25:20 2019 +0100 + + codec: faad: reject ELD profile + + (cherry picked from commit eaedf156a46ad8ac27bc64942892b358f91e4a61) + +commit ee3213605d176c0a884b1d93dff7fc48b8848400 +Author: Francois Cartegnie +Date: Wed Oct 5 17:18:50 2022 +0200 + + demux: adaptive: allow implementations to preparse + + (cherry picked from commit 0f9cde94991d12e253c480324f95ba513e5b99b1) + +commit 9e50bef342126f33e7962ac336e0b15a2bae93d6 +Author: Francois Cartegnie +Date: Wed Oct 5 17:14:36 2022 +0200 + + demux: adaptive: forward update status through stream + + (cherry picked from commit aeca11e9627781f05e9baee86fda2af87306e76c) + +commit 7d9d51ac981b90dd3602bdf2123c8f415bae361f +Author: Francois Cartegnie +Date: Wed Oct 5 17:13:36 2022 +0200 + + demux: adaptive: return tracker update status + + (cherry picked from commit 9d83a7ee1a6ec993e73e419fc84357cc6433c908) + +commit ea8e33c8f380cd1e65fde110aee4a0574f7224ab +Author: Francois Cartegnie +Date: Sun Sep 25 14:51:33 2022 +0200 + + demux: hls: set channels + + (cherry picked from commit c5b37cb43da4cd2507e970e05de53b24200d63bd) + +commit 4ff3adad7795d3eb28d3e85559edf620d517e767 +Author: Francois Cartegnie +Date: Wed Sep 21 16:10:16 2022 +0200 + + demux: hls: rework stream/media attributes propagation + + (cherry picked from commit a54d02b0c9a5b0a2073f393a33235d9adfd6c25d) + +commit d8ae0f09a5cb9b7e6ef9ec2717acaaf5fa782230 +Author: Francois Cartegnie +Date: Wed Sep 21 16:04:51 2022 +0200 + + demux: adaptive: codecs does not belong to ext-x-media + + (cherry picked from commit 7d37ad40e40419c28bf45ecf97fd0ea47cfa7f1e) + +commit f8a1f5d5451f18bfac1a5f1cd24c499194199a36 +Author: Francois Cartegnie +Date: Tue Feb 9 21:09:50 2021 +0100 + + demux: hls: prefer average bandwidth when available + + (cherry picked from commit f9b0cad3896c0276d467c5ad3be104baf946acdf) + +commit b607efd530c7c82681a34a7696d7d9d4fef1108c +Author: Francois Cartegnie +Date: Wed Oct 26 14:24:12 2022 +0200 + + demux: adaptive: fix unitialized var + +commit 5e58b6a9fa37d2fa11384cce6714c52811281146 +Author: Francois Cartegnie +Date: Thu Oct 27 20:49:05 2022 +0200 + + demux: adaptive: fix MIME format update + + refs #27441 + + (cherry picked from commit 7b2c84807e92b8b2282f3b25b0cd8759cbf8c472) + +commit 63289deb58e50da267f36852f4d93d10751e5be7 +Author: Francois Cartegnie +Date: Thu Oct 27 20:47:06 2022 +0200 + + demux: adaptive: skip ID3 in front of any segment + + more HLS crap FTW + + refs #27441 + + (cherry picked from commit e062e9d65010fc5b30ef46336da7de44c76a6125) + +commit 47bd9018f0f33770e850d038f9981503e04b25fc +Author: Brad Smith +Date: Sat Oct 29 20:11:50 2022 -0400 + + v4l2: use proper headers for OpenBSD's V4L2 support + + (cherry picked from commit c7905ecc665b1b464bbf13ddc395e2e7f8ddd8b2) + +commit ce9a09a2e62372300e9efcbab82d795b8493f298 +Author: Brad Smith +Date: Sat Oct 29 20:18:47 2022 -0400 + + v4l2: dlopen proper library name on OpenBSD + + (cherry picked from commit ed4a5feb243a201b7890672f3d376b4586a16593) + +commit 6e1a0b765c596c745a580db29ec27aacd07e6baf +Author: Martin Storsjö +Date: Fri Oct 28 22:27:32 2022 +0300 + + contrib: harfbuzz: Apply patches to fix building with Clang 16 + + This is a backport of + https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169 + and + https://github.com/harfbuzz/harfbuzz/commit/60c6b7786d9f4651ae2803bfc4ff4435b38a5bc6. + + (The first patch is enough to fix mingw builds, but the second one + is necessary if building harfbuzz on Linux with Clang 16.) + + (cherry picked from commit 75b0e59be9f989eefd76769fe7b4ae54acfd1471) + Signed-off-by: Martin Storsjö + +commit a0eecd9ea891a561de59fc9a017b9455e2d336be +Author: Steve Lhomme +Date: Sat Oct 15 07:40:25 2022 +0200 + + contrib: ffmpeg: use a release tarball + + There are proper release tarballs that we can use. It's must faster to get and + extract than git. If we need new upstream patches we can cherry-pick them until + the next release, like other contribs. + + (cherry picked from commit b0c7efaff3dcfc4c25484033d88c609947856b8c) (rebased) + +commit 9b707dc06a022f88855ea3f41f29024019944137 +Author: Steve Lhomme +Date: Fri Sep 9 09:40:18 2022 +0200 + + contrib: zlib: update to 1.2.13 + + Fixes CVE-2022-37434. + + (cherry picked from commit 0c0ab8186a6ff5a6b1cff7c528fe01f822abd6ce) (edited) + +commit e9eceaed4d838dbd84638bfb2e4bdd08294163b1 +Author: David Fuhrmann +Date: Thu Oct 13 18:25:12 2022 +0200 + + Update NEWS + +commit 4d9fbf01fea4a0c08930a96043c9d1db87b1f61f +Author: Tristan Matthews +Date: Tue Oct 4 09:19:40 2022 -0400 + + contrib: aom: update to 3.5.0 + + See release notes: https://aomedia.googlesource.com/aom/+/refs/tags/v3.5.0 + + (cherry picked from commit 27110b65c738c54bc47e437b5d5e971f5cb5edf5) + +commit ad26d63aa48f0da1b67a8caf565a5e808b06f0d1 +Author: Steve Lhomme +Date: Thu Oct 6 15:56:12 2022 +0200 + + picture: align picture width to 64 + + It seems the latest FFmpeg requires 64 bits alignment for some I420 output. + + Fixes #27285 + + (cherry picked from commit fa75a43b0bb9b2997fda7006b6a83d697ecd6c89) + + Signed-off-by: Steve Lhomme + +commit 535e17ff9faa95a819ab839891aba77d321b4691 +Author: David Fuhrmann +Date: Sun Oct 9 20:53:44 2022 +0200 + + On the road to 3.0.18, final NEWS update + +commit 4492db0c0045cc87c2350206c7d6151479871380 +Author: Brad Smith +Date: Tue Feb 1 22:57:25 2022 -0500 + + configure: use pkg-config file for sndio + + (cherry picked from commit a9406397ed0342b3dae17a31ed54e46b4fb86407) + Signed-off-by: Rémi Denis-Courmont + + Conflicts: + configure.ac + +commit 4b5506e3ff714f833afa6ca891de7ee6866e5e46 +Author: David Fuhrmann +Date: Tue Oct 4 08:29:32 2022 +0200 + + Update po + + Fixes some fuzzy strings which are not connected to correct source + file. + +commit e0dc425706b4c834b421b09fd7ce3bba623363d9 +Author: VideoLAN +Date: Mon Mar 14 23:09:17 2022 +0100 + + l10n: Chinese (China) update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit 34260a761a791ddbe33b2fbf23c683ef768f81f5 +Author: VideoLAN +Date: Mon Nov 15 22:17:14 2021 +0100 + + l10n: Swedish update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit ee3714c92897cf5ea56300305602a0dfa08bc155 +Author: VideoLAN +Date: Fri Jun 24 11:56:24 2022 +0200 + + l10n: Slovenian update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit 48b532203b60997d534086a81c6516c46e22f2e7 +Author: VideoLAN +Date: Mon Sep 19 16:26:45 2022 +0200 + + l10n: Portuguese (Portugal) update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit e8f0caa4c6f6bc8802f82fd9a157aec1c4f22ba7 +Author: VideoLAN +Date: Mon Jan 24 16:56:00 2022 +0100 + + l10n: Malayalam update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit f7a3d10d3cef26a0e16c88d6c313ba13f85ad4c2 +Author: VideoLAN +Date: Tue Apr 5 03:35:35 2022 +0200 + + l10n: Korean update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit 03f9ae417c77ebd782c4d9372e296465cec08f98 +Author: VideoLAN +Date: Thu Aug 11 23:56:48 2022 +0200 + + l10n: Georgian update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit a28646328105d21091d5e1478bae04bf2e4e908f +Author: VideoLAN +Date: Sat Dec 18 20:48:18 2021 +0100 + + l10n: Croatian update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit 1e326acedbb49ba7a3a0128536202afcde6f0815 +Author: VideoLAN +Date: Mon Jul 12 19:28:36 2021 +0200 + + l10n: Estonian update + + InfoPlist.strings: 100% translated + + Signed-off-by: David Fuhrmann + +commit fef232f9f51af5503cd11de24075311463d4b561 +Author: Marvin Scholz +Date: Mon Oct 8 10:53:50 2018 +0200 + + darwinvlc: Use FromCFString + + (cherry picked from commit d75d12bee277760353a4b710f1703d3ef3944b32) + Signed-off-by: Marvin Scholz + +commit cdd6c770726a4ea90b3dce0fda2cebd2899e08dc +Author: Marvin Scholz +Date: Mon Oct 8 10:52:58 2018 +0200 + + darwin/dirs: Use FromCFString + + (cherry picked from commit 82c18a3b4b72b677f2576e4cc6197aaad2fc2a61) + Signed-off-by: Marvin Scholz + +commit cbe4fe42c6bf68234e353606c739b53faa3e559e +Author: Marvin Scholz +Date: Mon Oct 8 10:52:45 2018 +0200 + + auhal: Use FromCFString + + Fix #27043 + + (cherry picked from commit 43663467cb534b97c01c6d7828b4b942741a4529) + Signed-off-by: Marvin Scholz + +commit 4650bfe24d5f2059db14c3ba8b2b1c07f6276bd8 +Author: Marvin Scholz +Date: Mon Oct 8 10:52:00 2018 +0200 + + text_renderer/freetype: Use FromCFString on darwin + + (cherry picked from commit 960a48626df9f0fcb4215394598977a347b34994) + Signed-off-by: Marvin Scholz + +commit 0a0605d7c875b7df9b3f51f9541d180ea43f5c35 +Author: Marvin Scholz +Date: Fri Sep 30 02:49:25 2022 +0200 + + upnp: Use FromCFString from vlc_charset.h + +commit 233b0b87a0fee4f489be578231b9657c6e65bd82 +Author: Marvin Scholz +Date: Mon Oct 8 10:51:33 2018 +0200 + + include/vlc_charset: Add FromCFString for darwin + + This is a helper function to obtain the copy of a char* from a + CFStringRef. + + Changes compared to master: + - Include CFString.h instead of the umbrella header + to prevent a type clash with guid_t declared in the + CoreFoundation headers. + + (cherry picked from commit f4b57268547f27172966cc7d850f797acaaa77d3) + Signed-off-by: Marvin Scholz + +commit bc266652766a3f2207b8439774ad98a216d2e5d9 +Author: Marvin Scholz +Date: Fri Sep 30 02:41:40 2022 +0200 + + upnp: Rename FromCFString + + Preparation to add it to vlc_charset.h + +commit ed93768cedee7dae31a5b44d57a38d59da4dd1cf +Author: David Fuhrmann +Date: Fri Sep 30 10:36:07 2022 +0200 + + configure.ac: Correctly set version to 3.0.18-rc2 + +commit 4fcace61801f418786c42487c6b06b693ee87666 +Author: Romain Vimont +Date: Mon Sep 19 17:17:01 2022 +0200 + + vnc: fix possible buffer overflow + + Thanks to 0xMitsurugi [1] from Synacktiv [2] for the bug report and fix. + + [1] https://twitter.com/0xMitsurugi + [2] https://www.synacktiv.com/ + + Fixes #27335 + + (cherry picked from commit 5eb783fd44ed6298db3e38f7765f21c42e4405f9) + +commit 38bc5514cea24ecc2f78a8d3fc24de163b8cce63 +Author: Francois Cartegnie +Date: Mon Sep 5 10:37:12 2022 +0200 + + demux: ogg: check ogg_sync_buffer allocs + + (cherry picked from commit 03100bbd06a1aeaf0cb580cff8204df3e05cb9eb) + +commit 2154ab15f89b641b553da829fec5d55b67873eb2 +Author: Francois Cartegnie +Date: Tue Aug 30 15:44:37 2022 +0200 + + demux: mp4: fix qtff v1 divbyzero + +commit 13426fb3eb33a64a4c03696a51101e3694806176 +Author: David Fuhrmann +Date: Wed Sep 28 20:23:52 2022 +0200 + + Update NEWS for 3.0.18-rc2 + + Update news, and bump version to 3.0.18-rc2. + +commit d7ddba57d8ade41533cb02cb20d4106b4f14a04b +Author: Steve Lhomme +Date: Mon Sep 26 07:17:11 2022 +0200 + + contrib: ffmpeg: update to the latest 4.4 hash + + In particular with the "lavc/pthread_frame: always transfer stashed hwaccel + state" fix for #27343 + + (cherry picked from commit dc1dea6ddd9e11fc25b2bd1c5da74afa04e23f65) (edited) + + edited: + * 3.0 supports libav + +commit 915f83e3034d185c255c47e02f816c6fe61a462f +Author: Alaric Senat +Date: Wed Sep 14 11:50:17 2022 +0200 + + contrib: upnp: remove wrong win32 safe wrappers + + Theses wrapper were too naively written and are causing a lot of + regressions on windows. + + This has been addressed upstream [1]. And is simply reverted for now, + waiting for a new release. + + Fixes #27306 + + [1] https://github.com/pupnp/pupnp/issues/411 + + (cherry picked from commit 751e0007e75da2fceba2f5d9f797db60eaef1db4) + +commit a4c6e9973998d749e33ba15b43fc2665f9f194ba +Author: Juliane de Sartiges +Date: Tue Sep 13 16:26:41 2022 +0200 + + kwallet: fix password search for password with either a realm or authtype + + even without an authtype the "?" widlcard was always added to search making + kwallet return no password for that query + + (cherry picked from commit 862c4a2d9d04075f2e88c34cc011b9b06046263a) + +commit cc4c37ebb32c0e519cf6959041e3bcb0d5f6922b +Author: Marvin Scholz +Date: Fri Nov 5 20:08:04 2021 +0100 + + lua: intf: luac: fix usage instructions + + (cherry picked from commit 7c5203ab1a9ff788eb25c3c6da2bfb8e13819a0b) + Signed-off-by: Marvin Scholz + +commit 99c124c572b083c924fd163e588394d17ab4d145 +Author: Marvin Scholz +Date: Fri Nov 5 20:07:51 2021 +0100 + + lua: intf: luac: remove unused requires + + (cherry picked from commit 3ccfc790018c2ba8b8263e72bb7aeeb85dce00c6) + Signed-off-by: Marvin Scholz + +commit 3b25a57df3b54181a47707c0a4ac543fb26b8795 +Author: Marvin Scholz +Date: Sat Nov 6 02:19:18 2021 +0100 + + lua: http: custom: remove deprecated module function + + The file directly modifies the global table (_G) so it does not + seem necessary at all to expose anything explicitly. + + (cherry picked from commit 33c7a44fd85c11c674c7564770eb5d073cbddf42) + Signed-off-by: Marvin Scholz + +commit 182e7f9e728af3e50c834b08d65c7d3ae60fe914 +Author: Marvin Scholz +Date: Fri Nov 5 20:07:13 2021 +0100 + + lua: host: do not use deprecated module function + + (cherry picked from commit 4109a34d6449b3a07c41c9fb269e2b18de769840) + Signed-off-by: Marvin Scholz + +commit b922d86fa016cfe3899acf45d8b07be013d29fad +Author: Marvin Scholz +Date: Fri Nov 5 19:56:14 2021 +0100 + + lua: httprequests: do not use deprecated module function + + (cherry picked from commit 82dd26ccaf241ad6ae9463c8b9c320b17fdd9daa) + Signed-off-by: Marvin Scholz + +commit 251ef7ee09156a0926ab446af52f24982cfbfecc +Author: Marvin Scholz +Date: Thu Nov 4 18:10:58 2021 +0100 + + lua: simplexml: do not use deprecated module function + + (cherry picked from commit c8a59b0ed0335ed3c6014314b97e2aa896690377) + Signed-off-by: Marvin Scholz + +commit 3ebac7971e481951050edc7861a83351081901e3 +Author: Marvin Scholz +Date: Thu Nov 4 18:10:51 2021 +0100 + + lua: sandbox: do not use deprecated module function + + (cherry picked from commit 94aa14103d4de56a69a3d935d2dd983c9da870fd) + Signed-off-by: Marvin Scholz + +commit e5ba5793de94172ee7d18c7439165ffc8fa9b039 +Author: Marvin Scholz +Date: Thu Nov 4 18:10:43 2021 +0100 + + lua: common: do not use deprecated module function + + (cherry picked from commit bfc88aa7a1ac64761f1078785116fd25ab4574be) + Signed-off-by: Marvin Scholz + +commit 0e909a13aefa00f76edef0f41c644030753c1351 +Author: Marvin Scholz +Date: Thu Jul 28 00:33:24 2022 +0200 + + share: lua: remove $Id$ magic comments + + These were used by SVN, we are no longer using that though. + + (cherry picked from commit 6995265a57b450c614033dd38b5f022e5886be6d) + Signed-off-by: Marvin Scholz + +commit 01dd8180f048de6c03f26e4290ab7c6b902222f1 +Author: Martin Storsjö +Date: Thu Sep 8 15:49:28 2022 +0300 + + projectM: Force building with a specific older C++ version + + This fixes errors like these: + + libprojectM/projectM.hpp:303:8: error: no template named 'auto_ptr' in namespace 'std' + std::auto_ptr m_activePreset; + ~~~~~^ + + The std::auto_ptr type was deprecated in C++11 and removed in C++17. + + The VLC C++ headers use C++11 features, so the only working + alternatives here are C++11 or C++14. + + (cherry picked from commit 4100c227d052cf5f804acd67904f698e89946110) + Signed-off-by: Martin Storsjö + +commit 41cf40b1799322e4cd38c1f5d81391016020da32 +Author: Martin Storsjö +Date: Thu Sep 8 15:28:02 2022 +0300 + + contrib: modplug: Force building with a specific older C++ version + + This project uses the 'register' storage class specifier for a lot + of variables, and C++17 disallows that storage class spcifier. + + This fixes building with newer compilers that default to C++17 + if nothing is specified (which is the default since GCC 11 + and Clang 16). + + When building with Clang 16 in C++17 mode, it fails with errors + like these: + + fastmix.cpp:678:2: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + SNDMIX_BEGINSAMPLELOOP8 + ^ + fastmix.cpp:291:2: note: expanded from macro 'SNDMIX_BEGINSAMPLELOOP8' + register MODCHANNEL * const pChn = pChannel;\ + ^ + + (cherry picked from commit 72e7335d664905331768728e4afff8134d2d3ac8) + Signed-off-by: Martin Storsjö + +commit 0637137ad94702585111a35396bb9a1d926de8d7 +Author: Martin Storsjö +Date: Thu Sep 8 15:28:02 2022 +0300 + + contrib: asdcplib: Force building with a specific older C++ version + + This project uses the 'register' storage class specifier for a lot + of variables, and C++17 disallows that storage class spcifier. + + This fixes building with newer compilers that default to C++17 + if nothing is specified (which is the default since GCC 11 + and Clang 16). + + When building with Clang 16 in C++17 mode, it fails with errors + like these: + + KM_util.cpp:357:3: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + register byte_t c = 0, d = 0; + ^~~~~~~~~ + + (cherry picked from commit fb8eb5edd26f856a1051b3b4525c0e6677aa2f32) + Signed-off-by: Martin Storsjö + +commit 3076009b25e859e9096de80e095fed9aa0b96efc +Author: Martin Storsjö +Date: Thu Sep 8 15:15:15 2022 +0300 + + contrib: projectM: Force building with a specific older C++ version + + This project uses std::auto_ptr, which was deprecated in C++11, + so stick to compiling in C++98 mode. (Either C++98, C++11 or + C++14 would work.) + + This fixes building with newer compilers that default to C++17 + if nothing is specified (which is the default since GCC 11 + and Clang 16). + + When building with Clang/libc++ 16 in C++17 mode, it fails with + errors like these: + + /projectM/Renderer/RenderItemDistanceMetric.hpp:20:46: error: no template named 'binary_function' in namespace 'std'; did you mean '__binary_function'? + class RenderItemDistanceMetric : public std::binary_function { + ~~~~~^~~~~~~~~~~~~~~ + + (The std::binary_function class is removed in C++17.) + + (cherry picked from commit 3e29d7f67991e60c8830e3a551419f7b8663f4b3) + Signed-off-by: Martin Storsjö + +commit f5e69654c1b49cd73e5da4cb6e09704a54db1312 +Author: Alexandre Janniaux +Date: Wed Dec 11 11:57:13 2019 +0100 + + mkv: remove deprecated std function + + std::mem_fun and std::bind2nd have been deprecated in C++11 and will be + removed in C++17. They were replaced by std::mem_fn and std::bind which + are easier to use. + + Signed-off-by: Hugo Beauzée-Luyssen + (cherry picked from commit 6fce792e89c8f3879705d0fc52caa43f699d5393) + Signed-off-by: Martin Storsjö + +commit 7c166c1451b50720ac5d2050c0f844034005ba35 +Author: Steve Lhomme +Date: Fri Sep 9 09:24:03 2022 +0200 + + Revert "contrib: ffmpeg: fix a rare crash on some odd files with DVXA" + + This reverts commit ad8bbb0d4ba523b405d8134caf357ae78009b94a. + +commit 7a6c749160da3748e3e3c826d87e216c8c88f91e +Author: Steve Lhomme +Date: Tue Sep 6 10:27:14 2022 +0200 + + contrib: ffmpeg: update to the latest 4.4 version + + Includes some fixes backported to 4.4. + + (cherry picked from commit af785abd295bc9446eceaf127ccfc9d1759b64e9) (edited) + edited: + - 3.0 also supports libav + + Signed-off-by: Steve Lhomme + +commit 4bb5e44373917ea06f0e94c75ca763200cce2d64 +Author: Felix Paul Kühne +Date: Mon Sep 5 11:48:40 2022 +0200 + + VLSub: add 29 more languages + + This adds all languages supported by the OSO backend and fixes #27291. + + (cherry picked from commit bfdf6b056991c27fc74b3550d1bd386316be16ee) + +commit 50d440647bd5a4c5828316c8a13e79ad91bf0fa3 +Author: Rémi Denis-Courmont +Date: Mon Aug 8 19:59:58 2022 +0300 + + araw: fix overflows in 24-bit decoder + + The high-order byte is promoted to 'int'. If the high-order bit is set, + this results in an overflow (into the sign bit) when shifted by 24 bits + to the left. This was flagged by the UB sanitiser. To fix that, promote + all bytes to 32-bit unsigned first, to perform overflow-proof unsigned + arithmetic. + + Then to avoid aliasing errors, make sure the output is written as signed + 32-bit values, since the decoder outputs S32N. + + (cherry picked from commit 9260acab6a7ecfd5118d3da2b885aeff39cf21da) + +commit 33b0b524b166f9ffd4b635d8a929ec8181d11578 +Author: Pierre Ynard +Date: Wed Aug 31 10:03:21 2022 +0200 + + youtube.lua: bump up severity of "n" parameter throttling warning + + Due to the severely increased complexity of "n" descrambling code, a + quick fix is unfortunately not foreseeable. For now, let users know more + clearly what's going on and what's to expect or not. + + Ref #27227 + + (cherry picked from commit 90dcfa0e78081770ecbd0a072b96a277aea4a214) + Signed-off-by: David Fuhrmann + +commit 00bd1f2d182b2ce0205699e8cbd88c5f867f2929 +Author: Pierre Ynard +Date: Wed Aug 31 09:39:18 2022 +0200 + + youtube.lua: don't silently fail on "n" descrambling script parsing + + The descrambling script section was updated from a simple and linear + chain of calls, to a complex execution tree with conditional branches. + Failure to recognize and parse this call structure (or lack thereof) + resulted in a silent no-op. Add a check to properly report an error. + + Ref #27227 + + (cherry picked from commit b735ef2cde0e5b982ff157aff59199eeca9b3a71) + Signed-off-by: David Fuhrmann + +commit 3f03bd047fb67a9cb27560b1902b038bbfda4fdd +Author: Pierre Ynard +Date: Wed Aug 31 09:31:14 2022 +0200 + + youtube.lua: fix crash on unexpected "n" descrambling transformation code + + It was possible, when encountering different code from what was expected + for some known transformations, to void the code parsing pointer instead + of advancing it, resulting in a subsequent crash of the script and total + playback failure. Add a fallback and check, to prevent and gracefully + deal with this, and still allow playback, even if throttled, in case of + descrambling failure. + + (cherry picked from commit 149444107513953b46f52675cea0408f324d4c04) + Signed-off-by: David Fuhrmann + +commit 0c8461b9619b03e713a505683b2e2dac757610dc +Author: Pierre Ynard +Date: Sat Feb 5 02:13:01 2022 +0100 + + vocaroo.lua: pass HTTP referrer to media URL request + + Since last month, requests without a valid referrer get rejected with an + HTTP 403 error. + + We might want to consider that the lua script API should track and pass + such referrers by itself. + + (cherry picked from commit 3c9c32ab3bd0258aa55bd353609c96846ce21373) + Signed-off-by: David Fuhrmann + +commit c9ab8c60248a3ca898b003d9c7cb26b9eab12f1d +Author: David Fuhrmann +Date: Thu Sep 1 08:14:56 2022 +0200 + + On the road to 3.0.18 + +commit 4508d659e18745207e6684b236e00ceed6fd6d55 +Author: Zhao Zhili +Date: Tue May 18 15:06:50 2021 +0800 + + demux: mp4: optimize mp4_chunk memory allocation + + 1. Avoid dynamic memory allocation for small samples_per_chunk + (less or equal to 2 sample per chunk). Depends on the test file + and OS, the time taking by MP4_TrackClean can be reduced from a + few seconds to dozens of milliseconds. + + 2. Merge some allocation to single memory chunk. For mp4 files + with a lot of chunks, the time taking by MP4_TrackClean can be + reduced by half. + + (cherry picked from commit 979bca40665e33227d88d8b4329fe68ce54b3fc0) (rebased) + rebased: + * on 3.0 MP4_ChunkGetSampleDTS() has a different signature + Signed-off-by: Steve Lhomme + +commit 21373dd130f445c3c4ebb12e33d7b235fe407d1a +Author: Zhao Zhili +Date: Tue May 18 14:53:02 2021 +0800 + + demux: mp4: remove unused variable + + (cherry picked from commit 0ecf4e819bff81290fd3e218ad7eb47fd0051312) + Signed-off-by: Steve Lhomme + +commit 0aecdcabaa27f32dc1e3de1832d22d9766cdfae6 +Author: Francois Cartegnie +Date: Thu Feb 4 19:58:02 2021 +0100 + + demux: mp4: refactor getting sample timings + + (cherry picked from commit fa6e7fed73becb9f73362e8013860a2708b6f9dd) (edited) + edited: + * 3.0 uses mtime_t + Signed-off-by: Steve Lhomme + +commit ae37b9950425cc5444ceea9fb5b3dddc7de05ae2 +Author: Francois Cartegnie +Date: Thu Feb 4 21:09:21 2021 +0100 + + demux: mp4: only have unsigned pts offsets + + since dts_shift is always computed, that should be + always positive. + + (cherry picked from commit 5132db8ad6840d04fbca1a0ea23db5cd1e5ac0a6) + Signed-off-by: Steve Lhomme + +commit 373fd1433bd75abc22fa98677042562dc56414f5 +Author: Steve Lhomme +Date: Wed Jan 9 10:56:53 2019 +0100 + + avcodec: map 10/12 bits greyscale pixel formats + + (cherry picked from commit 8263fd8bac67ecc5d6629ff5376973497fb54e2c) + + Signed-off-by: Steve Lhomme + +commit 9787c051507340792ab723cf90d1683f01761e6c +Author: Tristan Matthews +Date: Tue Jul 17 02:04:49 2018 -0400 + + codec: avcodec: map Y16 (Fixes #20814) + + (cherry picked from commit e121a52d969faa5f2625a555219b0af1b3743b27) + + Signed-off-by: Steve Lhomme + +commit 3e3015430033ddf1c628cf27f4647e1ecddbd81b +Author: Steve Lhomme +Date: Wed Jan 9 10:51:51 2019 +0100 + + fourcc: add 10 bits / 12 bits greyscale chroma + + (cherry picked from commit f50de4fa6453e6bc1a961e88e56f66d847af3ba7) + + Signed-off-by: Steve Lhomme + +commit 27cb4bb1fd637a6dc94e538f8f2d3502c99ee74b +Author: Tristan Matthews +Date: Tue Jul 17 02:03:42 2018 -0400 + + fourcc: add VLC_CODEC_GREY_16{L, B} + + Refs #20814 + + (cherry picked from commit 1c34053ec020be288d7dc6228f60681607c7adf3) + + Signed-off-by: Steve Lhomme + +commit 49a27d65c6a9f57e4c7d560468a12b0fdac41b21 +Author: Steve Lhomme +Date: Mon Aug 22 09:58:33 2022 +0200 + + contrib: dvdread: do not use btn_it and its parent as packed structures + + The 4x 12 bits packing is making the bitfield packing messy and incompatible + with (non)MS packing in dvdnav. In the end the structures are not read as + packed structures so we don't need to keep them packed. + + Upstream patch proposed at https://code.videolan.org/videolan/libdvdread/-/merge_requests/42 + + (cherry picked from commit 94db2f105f36c107115b8019ec4c91afc8ccdd18) + + Signed-off-by: Steve Lhomme + +commit 2d76f7dc422efdfc0d6c8ee920265bf1c7fc78ac +Author: Marvin Scholz +Date: Tue May 24 00:35:54 2022 +0200 + + caopengllayer: fix wrong fullscreen size + + When transitioning to fullscreen, the codepath for non-live + resize was used and did not trigger rendering here. + As the size if now handled by the window however, this resulted + in a wrong size as it was never actually updated. To prevent that, + always render with the proper size from the layer regardless + if we are in live-resize or not. + + Fixes #27276 + + (cherry picked from commit 3f012cc366ac0448cbfbecae66a6b2a31dfea518) + Signed-off-by: Marvin Scholz + +commit ae70f7d5252afa01b0c895e5c159beca918b5b93 +Author: David Fuhrmann +Date: Thu Aug 25 22:06:54 2022 +0200 + + configure.ac: Use pkg-config to detect presence of libgme + + Use the existing pkg-config file to detect presence of libgme. This file + is already shipped on all known libgme versions (checked back until + 0.6.0, which is from 2015). + + This fixes build with recent libgme versions, which added even more + dependencies which were missing in the old check. + + Fixes #27262 + + (cherry picked from commit 3a08825c8aea3148b4d51db85dd14d42c105987d) + +commit 4a9c9b545dccdecc427e7052d40bb90e1a4eed07 +Author: David Fuhrmann +Date: Thu Aug 25 22:04:18 2022 +0200 + + contrib: gme: Prepare pkgconfig file and list lc++ on mac + + On mac, we use libc++ instead of libstdc++. While the library is + actually build against libc++ already, the pkgconfig file still + hardcoded libstdc++ instead. + + Refs #27262 + + (cherry picked from commit 9946913fa0ef9fbd56112fc69dd58a5c2b14650b) + +commit b700dfd55eb9556118b1bc28c3f5dc0645d89d88 +Author: David Fuhrmann +Date: Fri Aug 26 08:51:27 2022 +0200 + + contrib: gme: Add libm to pkg-config file + + This library links against libm, so it should be added into its + pkg-config file for static builds. + + Refs #27262 + + (cherry picked from commit e5831665ea30c9fe0c4beb63e835c634b8117ca1) + +commit 90bbcedadbe985893706f7124cc472ee189b2b00 +Author: David Fuhrmann +Date: Thu Aug 25 22:02:34 2022 +0200 + + contrib: gme: Depend on zlib + + The latest version of game-music-emu links against zlib if it is + available. + + Refs #27262 + + (cherry picked from commit adf27a00179849228dee9220128b04b4670a8219) + +commit 5f94c5b72f3a2e4b6d6d49e23740b3b6996ec944 +Author: Steve Lhomme +Date: Thu Aug 25 10:22:34 2022 +0200 + + Revert "contrib: vpx: fix build with NDK25" + + This reverts commit fdb1909e6eb6f4f565a84a2452a53c4cc8433413. + + The 3.0 doesn't support NDK25 + +commit 675232e5932e5f205f03a485f1b56c7ae4f1ca6d +Author: David Fuhrmann +Date: Wed Aug 24 19:52:36 2022 +0200 + + Update NEWS + +commit d7d0bbf8be47bd242ab69375e39d3cf5754f8631 +Author: Romain Vimont +Date: Wed May 11 16:27:56 2022 +0200 + + decoder: update i_bitspersample + + The field i_bytes_per_frame was updated, but not i_bitspersample, + causing an inconsistency leading to a buffer overflow. + + Fixes #26930 + +commit 04b535561db7a11e3ca2684d31f09758957e2eb4 +Author: Tristan Matthews +Date: Wed Jun 29 17:58:33 2022 -0400 + + contrib: vpx: update to 1.12.0 + + Notable changes: + - This release adds optimizations for Loongarch, adds support for vp8 in the + real-time rate control library, upgrades GoogleTest to v1.11.0, updates + libwebm to libwebm-1.0.0.28-20-g206d268, and includes numerous bug fixes. + + Bug fixes: + - Fix to a crash related to {vp8/vp9}_set_roi_map. + - Fix to compiling failure with -Wformat-nonliteral. + - Fix to integer overflow with vp9 with high resolution content. + - Fix to AddNoiseTest failure with ARMv7. + - Fix to libvpx Null-dereference READ in vp8. + + (cherry picked from commit 1cc04dc41b047042fd5375e8313131176c85a2ff) + + Signed-off-by: Steve Lhomme + +commit 75b8aa7a0594371d31fe4bdf2299e27ba08106f1 +Author: Thomas Guillem +Date: Mon Aug 1 13:05:49 2022 +0200 + + contrib: vpx: enable back i386/x86_64 asm on Android + + Since relocation issues are now fixed. + + (cherry picked from commit 4386bd5f3272f9e6dc410e9398071513c3187ade) (rebased) + rebased: + * no wasm on 3.0 + + Signed-off-by: Steve Lhomme + +commit fdb1909e6eb6f4f565a84a2452a53c4cc8433413 +Author: Thomas Guillem +Date: Tue Jul 26 16:48:33 2022 +0200 + + contrib: vpx: fix build with NDK25 + + Disable neon_asm since it rely on arm-linux-androideabi-as (removed in + NDK25). + + Temporary commit. + + (cherry picked from commit 7be5d4d844361de2461c557ef0114eed3cdc5aee) + + Signed-off-by: Steve Lhomme + +commit 1ba3efcd5ada73402c92104497529baede892f06 +Author: Felix Paul Kühne +Date: Thu Nov 11 14:17:18 2021 +0100 + + contrib/vpx: fix compilation for aarch64 simulators on iOS/tvOS + + (cherry picked from commit c32d801a882773c0f6b22999afcd3c3a297f76f8) (rebased) + rebased: + * no wasm support in 3.0 + + Signed-off-by: Steve Lhomme + +commit a5bdd659b5e828961a8d91cadc0418ab82249e38 +Author: Tristan Matthews +Date: Sun Oct 10 10:29:28 2021 -0400 + + contrib: update libvpx to 1.11.0 + + (cherry picked from commit 668ef74e5971e1d90666194964c8af046e7fe442) + + Signed-off-by: Steve Lhomme + +commit bf49fd9a81e6d1848c57eced81542c2f3c21fb8b +Author: Tristan Matthews +Date: Mon Mar 29 12:48:11 2021 -0400 + + contrib: vpx: update to 1.10.0 + + (cherry picked from commit 3d128f5b7eb4c0c4a3418e23a08369ad90eced6a) + + Signed-off-by: Steve Lhomme + +commit abf2379a6e29b0b8dbd4354fb2655da1da37b606 +Author: Tristan Matthews +Date: Mon Aug 31 22:32:08 2020 -0400 + + contrib: update libvpx to 1.9.0 + + (cherry picked from commit 5a88236177425c275cd9d18059db690467b187ae) (edited) + edited: + * header of the 3.0 pacth was different + +commit 58d30c8b6432b8ba12f37f20900c9976670bab2e +Author: Johannes Kauffmann +Date: Mon Jul 11 19:35:57 2022 +0000 + + demux: dash: include cstdint, needed for uint64_t + + Fixes #27077. + + (cherry picked from commit 6fca76ebd76bf8fce9b111e31bda64015cdc770f) + +commit 7a1446e3852faaa22012b541332bef226e721843 +Author: Johannes Kauffmann +Date: Mon Aug 22 22:54:55 2022 +0000 + + OpenMAX IL: add more missing extern qualifiers + + Amends 8e50cc985ed1e6e42387af0383c37cfb5ffbf1d7. + + This should fix #24617, which is still an issue on 3.0.x (cf. #27256). + +commit ad8bbb0d4ba523b405d8134caf357ae78009b94a +Author: Steve Lhomme +Date: Mon Aug 22 11:16:32 2022 +0200 + + contrib: ffmpeg: fix a rare crash on some odd files with DVXA + + There is a cleaner fix proposed but it may have wider impacts and needs to be + checked on all platforms: + https://www.mail-archive.com/ffmpeg-devel@ffmpeg.org/msg137976.html + + This one should be safe for 3.0.18 + +commit f5b18999bad3777d2b094097249f867fb840df77 +Author: Steve Lhomme +Date: Thu Aug 18 15:04:27 2022 +0200 + + contrib: dvdread: fix bitfield size in packed structures + + Submitted here https://code.videolan.org/videolan/libdvdread/-/merge_requests/41 + + (cherry picked from commit a1e6e4dab2cc03ae63b1a39864fe39d74eb73e23) + + Signed-off-by: Steve Lhomme + +commit d2cad92d01c55f4533e3ab18fb14ab168bb7cd2b +Author: Martin Storsjö +Date: Fri Aug 19 15:46:46 2022 +0300 + + spudec: Fix function pointer incompatibilities + + This is an error in Clang 16. + +commit 9e4d83f3826bbcd2cef9d16a7d624175cc203697 +Author: Martin Storsjö +Date: Mon Aug 8 12:14:26 2022 +0300 + + d3d11: Avoid -Wint-conversion errors + + Clang 15 made "incompatible pointer to integer conversion" an error + instead of a plain warning. This fixes errors like these: + + d3d11va.c:426:29: error: incompatible integer to pointer conversion assigning to 'ID3D11DeviceContext *' (aka 'struct ID3D11DeviceContext *') from 'int64_t' (aka 'long long') [-Wint-conversion] + sys->d3d_dev.d3dcontext = var_InheritInteger(va, "winrt-d3dcontext"); + +commit 71707c2ffe284fcf95d706fa65bb8f2012d64a4c +Author: Steve Lhomme +Date: Tue Jul 9 14:27:42 2019 +0200 + + ntservice: fix warning on losing const attribute + + (cherry picked from commit 6add3c05520f0a81f9fe61d27eb31f1e1a1a8919) + Signed-off-by: Martin Storsjö + +commit 957906afccb73492809446b0988cabf7f0486134 +Author: Rémi Denis-Courmont +Date: Mon Feb 26 20:34:43 2018 +0200 + + ts: fix invalid casts + + (cherry picked from commit 779c87eaff8399a3c7f65fe51fcf107c727fc227) + Signed-off-by: Martin Storsjö + +commit b184d1fd45b68d6b7720b5d3f23bd5115b9d5c7a +Author: Rémi Denis-Courmont +Date: Mon Feb 26 20:46:04 2018 +0200 + + yadif: fix invalid function pointer conversion + + (cherry picked from commit 87724691c899a02d94fb64a3ef16868d65f3551b) + Signed-off-by: Martin Storsjö + +commit 57df8aeee69f4e30eba16dae6c6650d374cafc31 +Author: Steve Lhomme +Date: Mon Jun 3 09:04:50 2019 +0200 + + winvlc: fix warnings + + (cherry picked from commit 260ee399c517721806076a6ffd6dec7875afa1a4) + Signed-off-by: Martin Storsjö + +commit ab3617c26b444e7b9154d5e545c09c1bf170e5a6 +Author: Martin Storsjö +Date: Sun Jul 31 00:16:47 2022 +0300 + + contrib: qt: Backport patches to Qt 5.6 to fix compilation with latest Clang + + Clang 16 errors out on ill-formed constant expressions when setting an + enum value to an out of range value for a non-fixed type enum. + + These are all fixes that have been made in newer versions of Qt, but + which are backported to the version carried in vlc contribs. + +commit 1d4bcca17f9d00bf29fcbb76753a151a403ea847 +Author: Steve Lhomme +Date: Thu Jul 11 17:18:05 2019 +0200 + + contrib: crystalhd: fix forward declaration of a struct + + Clang doesn't like it and warns about setting the callback using this signature. + + (cherry picked from commit aee808c442476604846a8a33c48e51a0110957f7) + Signed-off-by: Martin Storsjö + +commit f22fc52d2e78ccd1f065d84c96ed36cefb768d46 +Author: Martin Storsjö +Date: Sat Jul 23 23:41:38 2022 +0300 + + contrib: gnutls: Backport a patch to avoid -Wint-conversion errors + + Clang 15 made "incompatible pointer to integer conversion" an error + instead of a plain warning. This fixes errors like these: + + system/keys-win.c:257:13: error: incompatible pointer to integer conversion initializing 'HCRYPTHASH' (aka 'unsigned long') with an expression of type 'void *' [-Wint-conversion] + HCRYPTHASH hHash = NULL; + ^ ~~~~ + + This backports + https://gitlab.com/gnutls/gnutls/-/commit/88d79b964d88730e316919d6ccd17ca0fe9b3244. + + (cherry picked from commit ef1d4f3d22abacb6b5333e5c1a3ff943255f9101) + Signed-off-by: Martin Storsjö + +commit 5c8512dfe1c5b2a2a918425b9de17c40be454675 +Author: Hugo Beauzée-Luyssen +Date: Thu Aug 4 09:50:52 2022 +0200 + + contrib: upnp: Bump to 1.14.13 + + (cherry picked from commit bf2819fd0bb212f200821ed33b8e041332b5a4ae) + +commit f6bd67bbe7f273433a599fb528434ba43377dbf3 +Author: Hugo Beauzée-Luyssen +Date: Thu Aug 4 09:46:09 2022 +0200 + + contrib: upnp: Remove unneeded patch + + If libupnp is built without --enable-debug, debug is entirely + deactivated. + When debug is enabled, users are required to call UpnpInitLog to enable + logging, otherwise logs are dropped + + (cherry picked from commit be9bc069b0599d8b33c3023855c91abcecbfaa5a) + +commit 07cd30a1cae34560e8d39be318847669c7306573 +Author: Francois Cartegnie +Date: Sun Jul 10 21:19:01 2022 +0200 + + packetizer: flac: do not check min frame size for fixed block + + cannot pass on truncated end + + (cherry picked from commit 1db4d294ca8185e5a9e25d823c40677831d9f538) + +commit affe9ad5acf87b1f48a593fcd10859da858f120a +Author: Francois Cartegnie +Date: Sun Jul 10 14:38:49 2022 +0200 + + packetizer: flac: move frame check outside reader + + (cherry picked from commit 1c03970b91ac9fd9f75d144f9e301c7131445910) + +commit afa25a995b5f68b63c92aec0b402db9c3d4220f5 +Author: Francois Cartegnie +Date: Sun Jul 10 14:38:09 2022 +0200 + + packetizer: flac: remove useless frame_size + + (cherry picked from commit 54ffcdec205870e09d3a8cabf6c03e831fc95406) + +commit 2b707aebc6e1f1f13e6cde18560eb86ed0d63b0a +Author: Francois Cartegnie +Date: Fri Jul 8 16:06:56 2022 +0200 + + packetizer: flac: fix fixed blocksize streams last pts + + (cherry picked from commit 1cd8422afd1de99b80951817e89ad7271c8364e5) + +commit 89fa35ef811ef10d3056a5e466aeb83cca716514 +Author: Francois Cartegnie +Date: Thu Jul 7 15:22:13 2022 +0200 + + packetizer: flac: add comments + + (cherry picked from commit 6aeaeb610dc54af85c46a68159af2043feeae33d) + +commit 7628565d292092ca0441a494eb320f7db45265de +Author: Francois Cartegnie +Date: Wed Jul 6 11:25:16 2022 +0200 + + packetizer: flac: fix potential endless loop on drain + + (cherry picked from commit d231265080bead89e3b6e031d3a85c37eb2b01ec) + +commit a57c3a843dc5c84561af27d91e9c3bd2e4da407b +Author: Francois Cartegnie +Date: Sun Jul 10 14:55:59 2022 +0200 + + packetizer: flac: don't send invalid frame on drain + + (cherry picked from commit 599757d9e43df3b2c95106aff77e595ad0d9cfe9) + +commit 5d8eed501f537b29a7f9e3f9490c7215b4df36e4 +Author: Alex Chernyakov +Date: Thu Aug 4 08:55:00 2022 -0400 + + dynamicoverlay: Fix memory leak when updating pictures + + In exec_DataSharedMem() memory is allocated via the call to picture_New(). + This memory is correctly freed via picture_Release() if an error occurs, + but if no error occurs and the function proceeds normally, the memory is + never freed. When the DataSharedMem routine is called repeatedly (e.g., + to update a picture continuously), this leak accumulates very quickly. + + (cherry picked from commit 41c1d1a9eee6f580273cafff30e01abdf3d5ad2d) + +commit 7a69931f84e5ecfcc51b3b731d4c2a834fcf2fe0 +Author: Steve Lhomme +Date: Mon Aug 8 06:28:21 2022 +0200 + + direct3d11: add missing allocation check + +commit 0e4c20fc941f931679fc897ba70047cebaca402b +Author: Steve Lhomme +Date: Thu Aug 4 13:24:24 2022 +0200 + + doc: libvlc: add a d3d11 external swapchain sample app + + In UWP apps (and now libvlc) it was possible to set the swapchain and D3D + context to use for the rendering, via the command-line. + + This sample app uses this functionality in a basic win32 app. + +commit 408d6e7ef57490a6b41f8d69d2ebafd1083a841d +Author: Steve Lhomme +Date: Thu Aug 4 16:38:04 2022 +0200 + + direct3d11: reindent + + No functional changes. + +commit 28e9869461bb05358da3fd9238a8deac081f704c +Author: Steve Lhomme +Date: Thu Aug 4 15:11:47 2022 +0200 + + direct3d11: allow external rendering even in non UWP builds + + It's still the only supported mode in UWP 3.0 builds. + +commit f8969a6677b7f2390d2aaebc32bb944ae197edb2 +Author: Steve Lhomme +Date: Fri Aug 5 07:24:25 2022 +0200 + + direct3d11: move up fake UWP GetRect + + No functional changes. + +commit 412bdb9938ac8a4b028c9219bd417a66285752c6 +Author: Steve Lhomme +Date: Thu Aug 4 10:59:07 2022 +0200 + + d3d11: enable the WinRT context/swapchain hack to work in non-UWP builds + + Since there is not GPU callbacks in 3.0 this allows using a custom D3D11 render + target with regular libvlc as we can do in UWP libvlc. + + Co-authored-by: Martin Finkel + +commit 5270d387181ef4e1ad7f8e6c7f55fba85b8885d4 +Author: Steve Lhomme +Date: Thu Aug 4 16:18:26 2022 +0200 + + win32: common: avoid using SetRectEmpty + + We can do the same in standard C. + +commit a65b22fd0b9026a48c92ce7891a9e5967a9f5930 +Author: Jean-Baptiste Kempf +Date: Wed Aug 3 14:09:11 2022 +0200 + + On the road to 3.0.18-RC + +commit c8cd3f95e337856fd04efd8545708855d978ce0c +Author: Marvin Scholz +Date: Mon Aug 1 21:54:55 2022 +0200 + + subsdelay: handle NULL segment text + + In some rare cases psz_text can be NULL, which would end up being + passed to strlen, causing a crash. + + Fix CD 524d077a-d613-4f2f-85b1-2a2af0747888 + + (cherry picked from commit 2322d55db35f8e44cba771600dd764816d4d0f42) + Signed-off-by: Marvin Scholz + commit 941e4373017d71ae33d901f42adbd4222d00ecb4 Author: Jean-Baptiste Kempf Date: Sat Jul 30 23:07:50 2022 +0200 diff -Nru vlc-3.0.18/doc/ChangeLog-2023 vlc-3.0.20/doc/ChangeLog-2023 --- vlc-3.0.18/doc/ChangeLog-2023 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.20/doc/ChangeLog-2023 2023-08-29 05:09:41.000000000 +0000 @@ -0,0 +1,2113 @@ +commit 4733d1cced9c51ca40bc04d578550c6b917fe2fe +Author: Jean-Baptiste Kempf +Date: Tue Aug 15 11:12:19 2023 +0200 + + News for 3.0.19 + +commit 90d44efbc53dcfc307780bebee34d979c9a3a37a +Author: Francois Cartegnie +Date: Mon Feb 13 22:07:04 2023 +0100 + + demux: mp4: fix duration probing on missing info + + (cherry picked from commit 2ce189cc177f1b7ae923c9a40ea0c4c1660c9d9c) + Signed-off-by: Jean-Baptiste Kempf + +commit 8b622fc01f610d88e834ba060e4aba6a3b13c4d3 +Author: Steve Lhomme +Date: Thu Aug 10 07:21:08 2023 +0200 + + d3d_shaders: fix placement with 270° rotation + + We should not subtract width and height values. + + Fixes #27976 + + (cherry picked from commit 4cd819e2389b5ad1389f401f0e39825c65c13abd) (edited) + + edited: + - SetupQuadFlat is in d3d11_quad on 3.0 + +commit c42011675667ccdbda15fcb4fb9f5e3ba28d8f91 +Author: Jean-Baptiste Kempf +Date: Sat Aug 5 12:18:49 2023 +0200 + + Update NEWS for 3.0.19 + +commit 9c46fed0cc8f3127e12efa43eecc644423f7ea4d +Author: Francois Cartegnie +Date: Wed Apr 5 14:58:31 2023 +0200 + + codec: libass: patch info for compatibility + + refs #27771 + + (cherry picked from commit 11d7708b1a6540b7473d159c6c2ac5c7f73b0b60) (edited) + edited: + - fmt_in is not a pointer in 3.0 + + Signed-off-by: Steve Lhomme + +commit 4d093ebb85bbbcc050218802694e03806f1dcb27 +Author: Francois Cartegnie +Date: Mon Apr 3 21:27:29 2023 +0200 + + contribs: update libass to 0.17.1 + + refs #27771 + + (cherry picked from commit 00e4996d1e0707a3a451a2faeb7b868328e03a2d) + Signed-off-by: Jean-Baptiste Kempf + +commit b2b0683da221438a5dd04b0a99a17b8b8b9bcf23 +Author: Johannes Kauffmann +Date: Fri Sep 16 20:50:17 2022 +0200 + + contribs: use $(GITHUB) consistently + + (cherry picked from commit 2dcd7516a08c38b75c901b19718bd301cbd22af1) + Signed-off-by: Jean-Baptiste Kempf + +commit 5241032ac7ecf9b5ab9be8f58f386508677c1e2c +Author: Steve Lhomme +Date: Fri Sep 16 08:31:56 2022 +0200 + + contrib: ass: disable tests + + And fix fribidi dependencies + + (cherry picked from commit 7ebe66444b45a2459fb7737d1ef8e371704c367f) + Signed-off-by: Jean-Baptiste Kempf + +commit dfdbbf18dad58a9a634b5c810c21453f0cbb7643 +Author: Steve Lhomme +Date: Thu Sep 15 12:57:48 2022 +0200 + + contrib: ass: remove forced -O3 + + This shouldn't be enforced. We already use -O2 on release builds. + + Introduced in 77f2dac1abc04ba5b1dc040c6cf90325622828fa + + (cherry picked from commit 4dce5d8ed7dbeb3cbf33ebe17b1fe1dce50abe1c) + Signed-off-by: Jean-Baptiste Kempf + +commit 5d4ade565056b7ab7323afdf8078aa54658b47d3 +Author: Alexandre Janniaux +Date: Wed Aug 2 16:32:54 2023 +0200 + + caopengllayer: restore vout_display_SendEventDisplaySize + + VLC 4.0 doesn't need that but 3.0 still has no windowing module, leading + to display size not being reported to the subtitle text renderer, and + leading to blurry subtitles and OSD. + + Because the size is coming from the display, it means that the first + time the subtitle is displayed, it will always be blurry depending on + the real display size and original media size. + + Regression from 8ff56952174af8e7a7d4ae61a413f88317c948a1. + + Fixes #27793 + +commit 6cc298d7d4d7f4eb05bafb0d0e71c24b18de1a5a +Author: Steve Lhomme +Date: Tue Aug 1 10:19:05 2023 +0200 + + packetizer: av1: fix bogus detection of monochrome + + Match the algorithm from the specs of [1] + + [1] https://aomediacodec.github.io/av1-spec/#color-config-syntax + + (cherry picked from commit 4bdb9c1b3681e58678c67c063c519feb2e607c9a) + Signed-off-by: Steve Lhomme + +commit a10dfa55be6627411c6bb6eb1a40be07b93ea98c +Author: Marvin Scholz +Date: Tue Aug 1 13:46:33 2023 +0200 + + macosx: do not assign intValue to prevent formatting issues + + This is a temporary solution for #22576 + + It results in numbers not having thousands separator anymore, which + is better than the user being unable to save the desired value. + +commit dfdc90c30a50a7e4fbdddeac2c06d51ade7ab385 +Author: Steve Lhomme +Date: Wed Jul 12 10:35:13 2023 +0200 + + avcodec: va: set the software source for special AV1 decoder + + So far we did not need it. We should always have the format matching + the one we detected by the decoder. If we don't that means the packetizer + failed to reset the decoder. + + (cherry picked from commit c901da645b3a00766831750fe882b8a52360ef88) + Signed-off-by: Steve Lhomme + +commit 632652bc15610af4289e0fadcf3ba5ae6c1f39dc +Author: Steve Lhomme +Date: Wed Jul 12 10:06:52 2023 +0200 + + avcodec: va: move the AV1 profile extraction in a function + + (cherry picked from commit 5892a9106aa2760b0bdf9d4a4c785dca9bfe21b8) (edited) + + edited: + - in 4.0 p_dec->fmt_in is a (const) pointer + - there's no VLC_ENOTSUP in 3.0 + Signed-off-by: Steve Lhomme + +commit ed9fc431df550d0c1cf520bf44e6e9086b44a1ba +Author: Steve Lhomme +Date: Wed Jul 12 09:56:09 2023 +0200 + + avcodec: va: pass the software AVPixFmtDescriptor for AV1 special decoder + + This is what is passed in the normal decoding case. + + This fixes an issue where 10-bit sources don't play properly as we can't + tell from the Profile 0 is we're decoding in 8-bit or 10-bit. + + (cherry picked from commit 1aa624e28db64fbd53888789ff91520ef8997983) + Signed-off-by: Steve Lhomme + +commit 1f686d34505e6ed50fe45a59f9aa4b06d7f0dc7f +Author: Thomas Guillem +Date: Mon Aug 1 17:45:26 2022 +0200 + + ci: android: use the last build script + + And use last vlc-debian-android image with NDK21e. + +commit b7faa116de3da02b20048cab2559cc06cc202b0e +Author: Francois Cartegnie +Date: Wed Jul 5 10:43:21 2023 +0200 + + demux: adaptive: fix es repick on format restart with variants + + since 05d9097987b57f6a36533f47e86a0eaeef17f453 + +commit ff0573857d5f7bbcc1c4330dfa705f842cc19d83 +Author: Thomas Guillem +Date: Fri Jun 9 15:05:49 2023 +0200 + + smb2: fix anonymous login with last Windows update + + Fixes #28187 + + (cherry picked from commit 167ab59642dae748f704d08c7f8be77bf00f1d1a) + Signed-off-by: Thomas Guillem + +commit 049a6f254d714dbd3acc7ea4c20e56f0eb081d2f +Author: Thomas Guillem +Date: Fri Jun 9 14:38:36 2023 +0200 + + smb2: use correct error code + + (cherry picked from commit ea7aeedcfce6b82a9a14dde9b9d5f6521861af58) + Signed-off-by: Thomas Guillem + +commit ba02ef605699a3d659fb24286284ed66b0f91dc5 +Author: Steve Lhomme +Date: Mon Jul 3 08:57:52 2023 +0200 + + dxva: use the actual surface size to test decoder support + + The container may lie but the size that libavcodec requests is the one it + will use. We need this size to probe the decoder in D3D11. There doesn't + seem to be a way to check the size support in dxva2. + + Similar to e4cc2f846b020e4e5a89046669c1eaddbebe0a34 but without setting + an output video_format_t. + +commit 73a654f3b7ae001bea319b76536780e3c0298ded +Author: Steve Lhomme +Date: Thu Sep 15 07:48:42 2022 +0200 + + contrib: fluidlite: don't build the shared library version + + (cherry picked from commit d8b338b5512f71b69fb9749b728ba94e21ad3cb6) + Signed-off-by: Steve Lhomme + +commit 755016e00344bd9dd387546d281e204a7e8ed289 +Author: Francois Cartegnie +Date: Wed Jun 21 17:55:06 2023 +0200 + + demux: hls: only force AAC on es demux + + shortcuts will enforce wrong profile and + demux will never end + + regression by fix 2396e15bd5b261b2c716ff653b5b8e6374be8bba + + (cherry picked from commit f272deef0f543cb8774843783ad703b04d2e34a8) + +commit d3b0ded30c00781485c5749845e8cf902aa307e5 +Author: Steve Lhomme +Date: Fri Jun 23 15:07:50 2023 +0200 + + contrib: do not require gtkdocize + + This unbreaks packages using autoreconf. + + (cherry picked from commit 7beb060516a8ce8a4ad4abf26aade3e3344f9ecd) (edited) + + edited: + * on 3.0 it was already done since 8179b10e7e692955a972f59ba50f3b51464d3854 + but not for Darwin targets + + Signed-off-by: Steve Lhomme + +commit 6f769d60a786179236112c02d8652f61dd36271d +Author: Thomas Guillem +Date: Tue Sep 20 16:22:28 2022 +0200 + + winstore: fix memleak if device failed + + (cherry picked from commit 7036c75d721ce9259a37486d525104c61bb01bea) + +commit 12cdc66ae1e8e549a0e8e6c13e6930fef45a6518 +Author: Steve Lhomme +Date: Tue Jun 20 12:34:31 2023 +0200 + + extras/tools: update meson to 0.56.2 + + The medialibrary that may be compiled in the VLC environment requires + meson 0.56 at least. + +commit fae285f41374cc477bd550ac48ac21e47e0dab10 +Author: Thomas Guillem +Date: Fri Jul 9 11:59:20 2021 +0200 + + avcodec: video: fix swfmt detection when using a hw_device_ctx + + (cherry picked from commit 906ffbaa631f54714ca55731b99f20d18100938e) (edited) + edited: + - 3.0 uses PixelFormat + - the code to handle b_hardware_only was already merged in 3.0 + + Signed-off-by: Steve Lhomme + +commit 25ac0d4e5dc50721411eb896d444d79bcf258780 +Author: Kerrick Staley +Date: Fri Apr 14 09:06:38 2023 -0400 + + Allow configuring mobile controller UI skip duration (fixes #26704) + + (cherry picked from commit e8b42d40867347ca5298351e28c3e69387dcf4ee) + +commit 26fb05e95724bd19f9a144c51bc11f79c609f3bc +Author: Pierre Lamot +Date: Wed May 31 15:19:44 2023 +0200 + + mmdevice: move MTA initialization to the worker thread + + MTA was checked in the Open function. As this function is called from libvlc + thread, this implies that a user of libvlc should have its own thread in MTA + which may not be possible for various reasons. + + * MuteSet, VolumeSet, Play, DeviceSelect, Close callback don't require MTA + * Flush, Pause and Start callbacks still require MTA, but as these functions are + called from VLC internal threads this is a lesser issue + + (cherry-picked from 2fa81b6f15f268e1aaeaf55d93f5bb628714d8cb) + +commit 370b1ae83727f4e8d47b250dea26b96f0905b942 +Author: Alexandre Janniaux +Date: Fri Jul 29 10:39:16 2022 +0200 + + darwin: redirect VLC_PKG_LIB_DIR/plugins on iOS + + On iOS and tvOS, dylibs must be wrapped into a framework and frameworks + must be flattened into the frameworks/ application directory (or global + to the system which is not possible in the general case), so dylibs + can't be in the VLC_PKG_LIB_DIR/plugins folder. Redirect + VLC_PKG_LIB_DIR/plugins toward VLC_PKG_LIB_DIR/ on those platforms. + + Manual cherry-pick from commit 89e90672db4a10243ae802c32272da8c062bc7bb. + The code is written directly in the src/modules/bank.c code given that + config_GetSysPath doesn't exist in 3.0. + +commit cf1baa09fa0bbd1b36ff2e0e370d53c51197ab0d +Author: Alexandre Janniaux +Date: Wed May 4 12:37:27 2022 +0200 + + module: bank: fix typo in framework loading + + The arguments to AllocatePluginFile were written in reverse, leading to + vlc_stat failing to find the file. In addition the value that should + have been written `-(sizeof ".framework" -1)` was actually written as + `-sizeof ".framework" -1` and thus `foo_plugin` was instead `foo_plug`. + + Typo from function refactor in 70d3002be1eaf1b78f1555733d02de4266b7f6ec. + + Cherry-picked from commit eb47c931a06ca8460a3720e4640559e83121bbb7. + +commit 068bfba722a0c68392b277971e7b15f06a1a9371 +Author: Alexandre Janniaux +Date: Fri May 28 10:37:38 2021 +0200 + + bank: add support for browsing frameworks + + Darwin platforms are using frameworks to embed libraries. Some of them + like iOS and tvOS even forbid the use of dynamic libraries that are not + wrapped into a framework. + + Since frameworks can contain various things (headers, resources, etc), + we don't necessarily want to browse their whole tree if their structure + is well-defined. In our case, since plugins are bundles and not dylibs, + there's not linking and there's no point in supporting versionning so we + can expect the plugin's dynamic library in the root of the framework, + named like the framework without the .framework part. + + Since MacOSX can also make use of frameworks, this is enabled for all + darwin platforms, though it might not use them. + + Cherry-picked from commit 70d3002be1eaf1b78f1555733d02de4266b7f6ec. + +commit 85b22197eb0798b6b54539faed7e7680a4ddce54 +Author: Alexandre Janniaux +Date: Mon Jun 27 11:31:21 2022 +0200 + + test: add iosvlc.m for iOS development + + iosvlc.m provides a binary usable as an iOS application, forwarding the + VLC arguments just like VLC on desktop. It allows easier iteration on + vlccore development for iOS, without the need to test in a VLCKit + application like VLC for iOS or new external application. + + It is currently designed for usage with dynamic plugins. + + To develop with it, you must generate a .ipa archive containing both + the resulting binary as executable, a PkgInfo file, an Info.plist file + describing the package and the libs (libvlc.dylib, libvlccore.dylib, and + every plugin .dylib or additional convenience libraries that are not + linked statically in the Frameworks/ directory. It must then be signed + with a developer certificate allowed by Apple and provisionned with a + mobileprovision file allowing installation on the given device for the + same developer certificate. + + Then, tools like libimobiledevice can be used to start the application + with additional arguments or environment variables. They can also be + added in XCode through the "Edit Scheme" menu. + + A big part of the iOS-specific code has been originally written by + Marvin Scholz in a more complete libVLC ios sample. + + Co-authored-by: Marvin Scholz + + Cherry-picked and adapted from commits: + e16f4d9bb6830fd5ad257a60babc0377a3ab39a2 + 0bfe88030104d2e9c962c24c144ce5c17294f146 + 96bee41831849597448a2414aa06faa1ee837a38 + 904998afec0b2d4192e877c19c7e5295bcaf4c67 + 54c392d7be7f73af6fabcf542c3c2670db00ff1a + +commit 9f2ebc0fa3f762c4511a313a984b8577ae17e111 +Author: Alexandre Janniaux +Date: Mon May 16 09:56:26 2022 +0200 + + package: apple: backport build script for iOS + + The build script allows building for iOS/tvOS without pulling the whole + VLCKit project, to build a standalone library for integrating libvlc in + applications. + + The main goal is being able to maintain libVLC 3.0 without requiring the + whole VLCKit environment to run tests. + + Cherry-picked from master branch at commit version + 44d44176aaadd4f742a70e9188f6ba578d65fab1, and modified the build.conf to + have all enabled contribs building and have the target version match the + 3.0.x system requirements. + +commit 850801f9d621fbfd9be86f996dc4cdeacb51b7ce +Author: Alexandre Janniaux +Date: Thu Jul 28 16:36:23 2022 +0200 + + src: Makefile.am: link CFNetwork on iOS + + Fix the following link errors when building for iOS with shared + libraries: + + Undefined symbols for architecture arm64: + "_CFNetworkCopySystemProxySettings", referenced from: + _vlc_getProxyUrl in netconf.o + "_kCFNetworkProxiesHTTPPort", referenced from: + _vlc_getProxyUrl in netconf.o + "_kCFNetworkProxiesHTTPProxy", referenced from: + _vlc_getProxyUrl in netconf.o + ld: symbol(s) not found for architecture arm64 + +commit 4ee99b802dd794047d8f4e1d5db34524c86547ee +Author: Alexandre Janniaux +Date: Thu Jul 28 16:36:23 2022 +0200 + + video_output: Makefile.am: fix link for glconv_cvpx on ios + + There were no LDFLAGS for iOS/tvOS and vt_utils were not compiled but + linking worked because videotoolbox was linked in the final static + library archive. + + Manual backport from commit 1b9a3f4687292d7393c08b72bf879acee487f246 + since interop_cvpx doesn't exist in 3.0.x and the code was pretty + different. + +commit 9f6cfa808bbc5388681b7acab3919bcdd1570d27 +Author: Alexandre Janniaux +Date: Mon May 4 14:23:49 2020 +0200 + + codec: Makefile.am: remove AudioUnit for audiotoolboxmidi + + AudioUnit framework is not found on iOS and is not needed on MacOSX. + + Cherry-picked from commit f68267079d9e9450d290fab486be6e4b825cea33. + Manual change where AudioUnit is still needed in this version of the + plugin for OSX. + +commit 38f89ca35ab245c9f83654d4637a3155d3c7bb03 +Author: Alexandre Janniaux +Date: Mon May 4 14:23:48 2020 +0200 + + audio_output: Makefile.am: fix audiounit_ios link + + Remove AudioUnit framework as it is not found on iOS and only + AudioToolbox is needed. + + In addition CoreServices cannot be linked for the iOS/tvOS targets as it + is available starting with iOS/tvOS 12.0+. + + Cherry-picked from commit e69c8fbacd8edc031ed6ada3babab39f367e3e95. + +commit 01cbbf75620934a181cd6e6bc11857da79906653 +Author: Alexandre Janniaux +Date: Tue Feb 2 16:26:16 2021 +0100 + + video_filter: Makefile.am: fix ci_filters's LDFLAGS + + The libci_filter_plugin_la_LDFLAGS must always contains the value of + $(AM_LDFLAGS) since it is at least defined once. Otherwise, automake + won't automatically define it to $(AM_LDFLAGS) $(LDFLAGS) and the plugin + won't be built correctly (ie, built as a convenience library because of + the lack of -rpath definition in LDFLAGS). + + In addition, the frameworks were not correctly set for iOS, which was + not a problem in static build because there is no linkage, nor in + dynamic build before because the plugin was built as a convenience + library, thus not linked nor installed to the device with the bundle + script. + + Since the frameworks are mostly common between MacOSX and iOS, just add + the corresponding OpenGL framework for each target, and define the other + frameworks out of any automake condition. + + Cherry-picked from commit c82c99522446be5f50296721d5716ae604eed426 but + partially modified to remove OpenGL/ES frameworks that are not needed + without the commit cb6b1d5fb6c28893479f737a94da2bc753cbe8b9. + +commit 68f257f6def4a6bc645fa7d058fd90da408b9fe3 +Author: Alexandre Janniaux +Date: Thu Jul 28 16:36:23 2022 +0200 + + videotoolbox: fix linkage of shared plugins on iOS + + Without the link to UIKit, UIDevice is left missing and leads to link + error. + +commit a7d9910e783dbbad2629f277254d4aa8c5d9d092 +Author: Tristan Matthews +Date: Thu Jun 1 11:29:56 2023 -0400 + + contrib: dav1d: update to 1.2.1 + + - Fix a threading race on task_thread.init_done + - NEON z2 8bpc and high bit-depth optimizations + - SSSE3 z2 high bit-depth optimziations + - Fix a desynced luma/chroma planes issue with Film Grain + - Reduce memory consumption + - Improve dav1d_parse_sequence_header() speed + - OBU: Improve header parsing and fix potential overflows + - OBU: Improve ITU-T T.35 parsing speed + - Misc buildsystems, CI and headers fixes + + Source: + + https://code.videolan.org/videolan/dav1d/-/releases/1.2.1 + (cherry picked from commit 2b9c1fdf6d190102d07d3b64ccd01f02333f3189) + +commit f3dd90c6b2c3390315e6010511830a75337063e9 +Author: Steve Lhomme +Date: Fri May 26 07:29:36 2023 +0200 + + d3d11_scaler: don't use upscaler with software chroma + + This was already the case before 1f529133a4440d3fc0b04a77cb06638aebe32170. + We can't feed the VideoProcessor with DXGI_FORMAT_UNKNOWN. + +commit 408c3420782253cec5b992d79d254ec7430c7028 +Author: Steve Lhomme +Date: Fri May 26 07:23:38 2023 +0200 + + direct3d11: use accurate logging of Scaler mode + + If we fallback to linear the log was wrong. + +commit 54cfa3e7c496b8fafb63248151d544ac0f73110d +Author: Steve Lhomme +Date: Mon May 22 16:35:55 2023 +0200 + + d3d11_scaler: force RGBA output from the video processor + + (cherry picked from commit 1f529133a4440d3fc0b04a77cb06638aebe32170) + Signed-off-by: Steve Lhomme + +commit a592a95efb123ec514475b75c00ff3d589164a46 +Author: Steve Lhomme +Date: Mon May 22 16:33:55 2023 +0200 + + direct3d11: get the d3d_format from the d3d11_scaler + + It could select a different format than the one the decoder sends. + + (cherry picked from commit 894142a0cb0b4b33c9a3f56579b67b315a1e8a11) + Signed-off-by: Steve Lhomme + +commit 70f0f4185f62d2414a4fafd8d4216dfc9f88b1f5 +Author: Steve Lhomme +Date: Mon May 22 15:02:50 2023 +0200 + + direct3d11: initialize the VideoProcessor before the shaders + + This will allow the VideoProcessor to use its own internal format. + +commit 51dd20cc622f9c2d1961765e2d04c0a6633cf296 +Author: Steve Lhomme +Date: Mon May 22 15:00:46 2023 +0200 + + direct3d11: use a custom d3d_fmt for the pool + + This will allow the VideoProcessor to use its own internal format, which + also needs to be know when creating the shaders. + +commit 4f39d5b4729ae139cc4021a8c309ce79da9ed71b +Author: Steve Lhomme +Date: Mon May 22 16:08:47 2023 +0200 + + d3d11_scaler: fix position when the source as a SAR + + (cherry picked from commit 233bd70227619a5c38c449d3c31f592545702bd4) + Signed-off-by: Steve Lhomme + +commit 90e7e1c3fc2544119a3ca1cf0e4e41508bf173c8 +Author: Steve Lhomme +Date: Wed Apr 19 13:32:42 2023 +0200 + + CI: don't block builds when snap build fails + + We need to check what is wrong but usually it's the same as Debian builds. + The snap building depending on Ubuntu server is not very stable. So we should + not care too much when it breaks. + + (cherry picked from commit 48a6b25031c13d179632d31ecd3c9a72f271e35a) + Signed-off-by: Steve Lhomme + +commit 9d7cae47313fbe3907f4528c64443961ec93a049 +Author: Francois Cartegnie +Date: Tue May 16 17:10:04 2023 +0700 + + demux: real: fix handling of PCR + + refs #20179 + +commit 534b936fdcf59829d275fd5b82c95ebcc2fe8f5f +Author: Claudio Cambra +Date: Sun May 14 16:40:41 2023 +0800 + + macosx: Ensure whitespaces are trimmed in http field before converting to UTF8 + + Signed-off-by: Claudio Cambra + +commit a84accf6063c17e80e03d8208341771912b80956 +Author: Claudio Cambra +Date: Sun May 14 16:38:07 2023 +0800 + + macosx: Ensure setMRL trims whitespace of MRL + + Signed-off-by: Claudio Cambra + +commit 1ffa1ecfe086a86d8361dcab162862afaeb759e4 +Author: Claudio Cambra +Date: Sat May 13 21:07:50 2023 +0800 + + macosx: Fix stepper sizing issues in preferences + + Signed-off-by: Claudio Cambra + +commit 0947c83fc54f352d238bb613c7deefb30adfe332 +Author: Claudio Cambra +Date: Sat May 13 17:38:43 2023 +0800 + + macosx: Set size of slider in prefs_widgets.m to NSControlSizeSmall, avoiding clipping + + Signed-off-by: Claudio Cambra + +commit 34cd4a615437c3fbef48458cd9328b9de9cb61d3 +Author: Felix Paul Kühne +Date: Thu May 11 12:35:19 2023 +0200 + + contrib/upnp: disable reuseaddr and fix option + + Use of SO_REUSEADDR leads to a busy loop within libupnp and very high + battery usage. This disables the option and actually fixes its + functionality by patching the library. Patch to be upstreamed. + + Manual backport of 74b765d8 + +commit 3bb4299198c0a498bfe3f941b35964f5788095c7 +Author: Francois Cartegnie +Date: Mon Oct 17 15:36:29 2022 +0200 + + demux: avi: fix unmatched video codec + + Parsing bitmapinfoheader resets to MS fourcc. + Demuxer's codec conditionals cannot match. + + (cherry picked from commit 9bb482ba20ce157202ca7de3dc7b7ac140103058) + +commit cee5fdbd7615bd1ccc07d59ae13350da55454db7 +Author: Francois Cartegnie +Date: Mon Oct 17 21:40:33 2022 +0200 + + demux: avi: extract meta from QNap header + + (cherry picked from commit 3471073604ebd12875572e4840dae66ee7bad4be) + +commit bb8a4cf34c3010d713e1beb2a260efba8935d60b +Author: Francois Cartegnie +Date: Mon Oct 17 17:40:26 2022 +0200 + + demux: avi: fix peek beyond QNap header + + (cherry picked from commit 6853c770a818b9dde42b0ca3632af087e105f0dc) + +commit a7205f083bcf02009e3281b7e713ff2a589de2b7 +Author: Francois Cartegnie +Date: Fri Oct 21 11:21:11 2022 +0200 + + demux: avi: add QNap fourcc defines + + (cherry picked from commit 13e48e51a475a22b7845ba25921bce628cc6250b) + +commit e8751a5436acafff0e77056489dfdd3c87170658 +Author: Jean-Baptiste Kempf +Date: Mon May 8 09:47:31 2023 +0200 + + Update NEWS for 3.0.19 + +commit f098271f03dfb54a6fd029efb87ed144eb74d7de +Author: Francois Cartegnie +Date: Mon Oct 17 11:07:50 2022 +0200 + + demux: avi: change index non fatal messages to warning + + (cherry picked from commit bb629537b156c8ead0975c420fed1ccbcb55113a) + +commit e61aa5e7c302f6c3e5f38c1df9768d4bed5f35cd +Author: Francois Cartegnie +Date: Sun Oct 16 14:30:11 2022 +0200 + + demux: avi: fix bogus indexless sample reads + + was always using the previous chunk size + + refs #27425 + + (cherry picked from commit b108e622d9431bd9153658089adfa7cdcf5fb231) + +commit e2cc130f634e16e33b524b1addf8118f42df04c2 +Author: Francois Cartegnie +Date: Mon Oct 17 20:33:00 2022 +0200 + + demux: avi: return insert position on indexAppend + + (cherry picked from commit 817e0d30c42c8ee3b245c7d9d5fd5cd7370989e8) + +commit ccdc0322967379e6d9e28fe3764f5933f2bea0af +Author: Francois Cartegnie +Date: Tue Oct 11 21:01:09 2022 +0200 + + demux: avi: add proper check for index alloc + + (cherry picked from commit 2bb108680bb633e9e695f93cd988be9fff0f44b6) + +commit a8dc27d9a656df75b927c874760a438474567bae +Author: Francois Cartegnie +Date: Tue Oct 11 17:54:11 2022 +0200 + + demux: avi: replace redundant track lookups + + (cherry picked from commit cfc233814e22e8c9e63ab983a0f1d2968cdd0bfb) + +commit 0a0ed8895a57e3af438f3e9255d290e7115afa34 +Author: Francois Cartegnie +Date: Tue Oct 11 17:44:03 2022 +0200 + + demux: avi: replace useless define + + (cherry picked from commit 4ea55641013820e447c7a39eaf26c7ec0bdb3c73) + +commit c8b6380b00c3f3f27b363e04b8a769a922192b14 +Author: Francois Cartegnie +Date: Tue Oct 11 17:38:00 2022 +0200 + + demux: avi: simplify audio seek computation + + (cherry picked from commit 58aba619c8a435c4a156404661b24a12d77d543c) + +commit f150301757088c2ea841067e967b1a90b669b6a8 +Author: Francois Cartegnie +Date: Tue Oct 11 16:06:20 2022 +0200 + + demux: avi: add comments + + (cherry picked from commit 9836217e0ed6cb24a560c6dc42fda2b1af063085) + +commit 91299bbcc18089c73c030dfda361d9c823fa6c59 +Author: Francois Cartegnie +Date: Tue Oct 11 16:05:42 2022 +0200 + + demux: avi: remove unneeded temp var/refetch + + (cherry picked from commit b354b0529a0c88f1cb48d21987801e537eafed38) + +commit 8a561ea296d9d9e056f8f26352ae9b27e024520f +Author: Francois Cartegnie +Date: Tue Oct 11 11:47:20 2022 +0200 + + demux: avi: move around code to ease understanding + + (cherry picked from commit c6cc1df8e233818ca0ae1d423012f5099223ed3c) + +commit dbcc0760a0d01f9554a94896e5b3b5c78d7d3f85 +Author: Francois Cartegnie +Date: Mon Oct 10 15:16:36 2022 +0200 + + demux: avi: account header outside of sample size + + (cherry-picked from commit c8fe3d812c277821ade872e334e78acc19deaf03) + (cherry picked from commit 32705bd3675e8fb87eb3c5d827f91a5ae8d0bc3f) + +commit fc7e4a2f63e576c4bfcccd48c8be8aa1caa7c9dd +Author: Francois Cartegnie +Date: Tue Oct 11 17:10:27 2022 +0200 + + demux: avi: set frame flags on video_es only + + (cherry picked from commit 4502f33c20e46f5f4837b47cd99e552d65f4b360) + +commit 7533c9eee9f827ae2da8afb6249e07791d098102 +Author: Francois Cartegnie +Date: Thu Oct 13 00:28:28 2022 +0200 + + demux: avi: interleave 0 samplesize PCM + + Avoids sending [a single] montrosample[s] + + refs #27393 + + (cherry picked from commit 4ed9fa53956d77ca6215f42831b0c5a15ce8d6c6) + +commit 9bf98ebf8c692c691b947b53ec5594d426902d61 +Author: Thomas Guillem +Date: Tue May 9 14:45:19 2023 +0200 + + coreaudio: add missing aout_FormatPrepare() + + It was missing after the format was being set to FL32, causing + i_bytes_per_frame mismatch when the input format size was different than + 4. + + It is already done in MapOutputLayout() since this function change the + number of channels but it was not done for the MapInputLayout() case. + + Regression from ea9c30171d821dc5d066ff0a762ce5d4ebf256db + + Fixes #28117 + + (cherry picked from commit c2b716c3148fbd8c8137434289007d6b70f7f2c5) + Signed-off-by: Thomas Guillem + +commit 1965464a6d7b1a2e3254b2bae119e34cad8ca21f +Author: Thomas Guillem +Date: Fri May 5 09:06:16 2023 +0200 + + demux: mkv: fix busyloop when seeking to 0 + + Fixes #28081 + + (cherry picked from commit c6d6da2dbe27e8a3666386772628f3afabfb5e9a) + Signed-off-by: Thomas Guillem + +commit 292c4756f79a9bd3097eaef234737e274bde3f68 +Author: Russell Greene +Date: Fri Apr 28 12:01:58 2023 -0500 + + demux: ts: fix seek issues in some streams + + Fixes #27646 + + Currently, VLC's SeekToTime algorithm for MPEG Transport Streams involves a number of arbitrary restrictions when searching for PCR timestamps. It rejects packets whose PIDs are not included in the current program and it also rejects packets that do not contain a payload as well as packets that do not contain the payload start indicator. + + However, per the official documentation describing the MPEG-TS format (ITU-T H.222.0 version 7.0) there are no such restrictions placed on where the PCR can be set (nor are there official recommendations on it). It specifies that the PCR is part of the adaptation field, and it's perfectly valid to make a packet with "adaptation field only" and no payload. + + References: + * Chapter 2.4.3.3: + - Table 2-3: "The transport packets with PID values 0x0000, 0x0001, and 0x0010-0x1FFE are allowed to carry a PCR." + - Table 2-5: "'10': Adaptation_field only, no payload" + - Table 2-6: PCR is an optional part of the adaptation field, see 2.4.3.5 for details + * Chapter 2.4.4.10: See PCR_PID + + Our observation of the existing algorithm is that the restrictions on the contents of the packet and the type of stream are intended more for the subsequent "ParsePESHeader" call, as those restrictions make sense when using that mechanism as a fallback method to find the PCR. However, by including these restrictions prior to the line that gets the PCR if "p_pmt->i_pid_pcr == i_pid", it's rejecting packets that could have otherwise provided PCR information. + + By moving the restrictions to later within the algorithm, we allow for any packets containing a matching PCR_PID to potentially supply that PCR information. This resolves seeking issues on any video that was created with PCRs set on packets without payloads. + + (cherry picked from commit 80c4515fac992580486967c724ef56d8cbfd0246) + Signed-off-by: Francois Cartegnie + +commit 99b71d93a0f8b322caa04cc8ef2b4c2be60ea1e5 +Author: Steve Lhomme +Date: Tue Jun 29 17:43:06 2021 +0200 + + avcodec: add a hardware-only lavc AV1 video decoder with higher priority + + The priority is higher than dav1d so it can handle hardware decoding even if + dav1d is present. + + This version of lavc should only allow decoding if the decoder has a profile + that can be decoded by the hardware, otherwise it should let other decoders try + to do the decoding (dav1d, lavc with current priority, etc). + + (cherry picked from commit cd4d32f71b27c439a44ff37abf2718dc064f2ff1) (edited) + edited: + * 3.0 doesn't include libavutil headers for metadata + * in 3.0 p_dec->fmt_in is not a pointer + * 3.0 doesn't have the meson file modifications + + Signed-off-by: Steve Lhomme + +commit fc7816c9c5c0f5fd8f1ca44c5aa707eebaeca818 +Author: Steve Lhomme +Date: Tue Aug 30 13:16:26 2022 +0200 + + avcodec: add a flag to only allow hardware decoding for the decoder + + Only use 1 decoder thread when allowing only hardware decoders. + + Restarting the decoder silently is not allowed. Either we can reuse the va or + we need to reload the decoder outside of lavc. + + (cherry picked from commit 1effe16f9ff83042843b2fdda6bc7abe68cb7103) (edited) + edited: + * 3.0 doesn't have a defaultfmt but uses p_sys->pix_fmt as it's missing + 906ffbaa631f54714ca55731b99f20d18100938e + * 3.0 calls vlc_va_Delete() with a hwaccel_context + + Signed-off-by: Steve Lhomme + +commit a2350b3787378a93c8d764b5c7e10b662840c3b1 +Author: Steve Lhomme +Date: Tue Aug 30 15:10:20 2022 +0200 + + avcodec: move the code to open a VA in a function + + Now the (un)locking is optional. + + (cherry picked from commit 4416251e1bb5d5e16021a053056fddf3fb7fce4c) (edited) + edited: + * 3.0 uses a vlc_sem_t instead of a vlc_mutex_t + * 3.0 uses vlc_va_GetChroma() as there is no vlc_va_MightDecode() + * 3.0 doesn't use a decoder device or video context but uses a test picture + from the vout pool + * 3.0 uses more version checks for AV_PIX_FMT values + + Signed-off-by: Steve Lhomme + +commit 8b6eab7dd67988abda34bedfad7aad1adc37bd92 +Author: Steve Lhomme +Date: Tue Aug 30 13:31:09 2022 +0200 + + avcodec: split the InitVideoDec function in 2 parts + + No functional changes. + + Also move the profile initialization with the p_sys init. + + (cherry picked from commit aad2bdfd9ef4f168036911652af10430f3196d5b) (rebased) + rebase: + * the code around the code move is slightly different + + Signed-off-by: Steve Lhomme + +commit d7bb870732da0205213920db1f0333646598f2c4 +Author: Steve Lhomme +Date: Fri Jun 25 16:26:54 2021 +0200 + + directx_va: allow AV1 decoding + + (cherry picked from commit 50aeffdf10f99f5ef351d08a73e59449c994700c) (edited) + edited: + * on 4.0 there's also the chroma subsampling information per format. + + Signed-off-by: Steve Lhomme + +commit 34d5ba17a8e0f033d0608997b23884bff8864112 +Author: Steve Lhomme +Date: Fri Apr 8 10:28:37 2022 +0200 + + avformat: demux: consider AV1 with no extra data as not packetized + + In may come in packetized form but the extra data are not given (from raw OBU + files). + + (cherry picked from commit 8a60c1c4ad19ca896cd88efcadc37918c0a7c6b0) (rebased) + rebased: + * the code around is slightly different + + Signed-off-by: Steve Lhomme + +commit cac557521e0dfbe11bf5c56d1110be4b708ec74c +Author: Steve Lhomme +Date: Fri Apr 8 12:05:23 2022 +0200 + + packetizer:av1: add a function to compare sequence headers + + A change in a sequence header means the stream has changed. + + (cherry picked from commit d675af28297164e3c67bee00d4bb0b507e72adee) + + Signed-off-by: Steve Lhomme + +commit f2d4e768ded782d9b8a1b1d6801a327158284dc4 +Author: Steve Lhomme +Date: Mon May 2 13:55:30 2022 +0200 + + packetizer: av1: always set subsampling_x/y + + Especially since it's mostly 1 (4:2:0) and we were supposed to read the + chroma_sample_position in that case. + + (cherry picked from commit b1e684c77a725884d315989a5341d0522d16d1db) (rebased) + rebased: + * COLOR_RANGE_LIMITED doesn't exist in 3.0 so we use 0/1 + + Signed-off-by: Steve Lhomme + +commit 80ed5157ccc7bd8eaa3a967c7048dcbf948dc752 +Author: Steve Lhomme +Date: Wed Sep 9 15:57:42 2020 +0200 + + packetizer: av1: provide the OBU chroma + + The VLC chroma contains both the subsampling and the bitdepth. + + VLC_CODEC_GREY* is used for monochrome. + + (cherry picked from commit bd4e454969fd69658d78eca70ecd51abfaaf0060) (rebased) + rebased: + * 3.0 doesn't have COLOR_RANGE_LIMITED so we use 0/1. + + Signed-off-by: Steve Lhomme + +commit 33adb05cac13390eabedc005bf2c7af4a216c4b3 +Author: Steve Lhomme +Date: Fri Apr 8 12:10:58 2022 +0200 + + packetizer:av1: detect sequence header changes + + When the sequence header changes we need to know it has changed so the output + values can be reset. + + In particular the visible size was not reset since it was set initially by the + demuxer. The first sequence header received is still not used to overwrite the + visible size after this patch. + + The extra data were not reset even though they contain the sequence header. + + Because there changes were not detected the new output format is never + forwarded. + + Fixes #26811 + + (cherry picked from commit e65c74fdab537df17bfeadf554b1c1d2873120ea) (rebased) + rebased: + * color_range is b_color_range_full on 3.0 + + Signed-off-by: Steve Lhomme + +commit 6f8f25621baea4026a99ba9301e1015d38d363c8 +Author: Steve Lhomme +Date: Fri Apr 8 12:11:36 2022 +0200 + + packetizer:av1: remove always true test + + (cherry picked from commit fe5c91cf4f5b57fdf4619dfaa34f14dfaec32f66) + Signed-off-by: Steve Lhomme + +commit 86e8d3bf34b3c333f60a6b87c0283fb5882e38eb +Author: Steve Lhomme +Date: Fri Apr 8 12:04:13 2022 +0200 + + packetizer:av1: fix debug formatting + + (cherry picked from commit db1a38ff9e5eb3c8237e7fb42e71ccdc8c990180) + Signed-off-by: Steve Lhomme + +commit 9c1c1edb451403e81650dfd249a3084c1acb9c64 +Author: Damian Życiński <7damian7@onet.eu> +Date: Wed Apr 19 16:45:35 2023 +0000 + + subtitle: allow lowercase hex colors + + (cherry picked from commit 3b4307c1432bd8c2a58015f9e80fb187fe1bee5b) + + Signed-off-by: Steve Lhomme + +commit 1e6c6a74904d1257de32d6852815061a14388143 +Author: Damian Życiński <7damian7@onet.eu> +Date: Wed Apr 19 15:08:17 2023 +0000 + + subtitle: allow lowercase hex colors + + (cherry picked from commit f6affa762fd3238b78d80705f2dc8832c0442f72) + + Signed-off-by: Steve Lhomme + +commit ed4a65e64f07bfe2464d8c13d5e8e14bd0c9cae0 +Author: Francois Cartegnie +Date: Tue Apr 25 14:57:36 2023 +0700 + + demux: mp4: base chapters + ES logic on brand instead of codec + + This fix no longer relies on the codec and allows + to avoid enabling chapters as SPU_ES as ffmpeg muxes chapters the + Quicktime way without using that brand. + + refs #25561 + + (cherry picked from commit ca6551dd951e0bc529dc946781bdba53707504b1) + +commit f755e4f29042f872f0469e46efcc5f377f3e2b3a +Author: Kerrick Staley +Date: Tue Feb 14 14:21:38 2023 +0000 + + Enlarge buttons in remote-control web UI + + (cherry picked from commit 27042bbbe479970a51883cc28373ec5575efb699) + +commit 56222b9290dd9bf08e02b10b1e9ee13d68931fc2 +Author: Steve Lhomme +Date: Tue Apr 25 15:40:35 2023 +0200 + + direct3d11: remove unneeded forward declaration + +commit 467cd307b212ace27fb13cf6304049db4800e42a +Author: Steve Lhomme +Date: Wed Apr 12 14:09:24 2023 +0200 + + direct3d11: add Intel based super resolution + + (cherry picked from commit 8892ebd6f1735fde6433473e7737767733a180ae) + + Signed-off-by: Steve Lhomme + +commit 5f10bc7cf5ebd46d612994fb30f3370dbb8e5960 +Author: Steve Lhomme +Date: Wed Apr 12 14:09:06 2023 +0200 + + direct3d11: use NVIDIA super-resolution upscaler + + Co-authored-by: Steve Lhomme + + (cherry picked from commit beac9098dbe49c6e18e842c19dd773c1b395ddef) (edited) + + edited: + * the direct3d11 is in C++ in4.0 + * 3.0 doesn't have DXGI_RGB_FORMAT or DXGI_YUV_FORMAT + * 3.0 doesn't have DXGI_CHROMA_GPU + * the d3d_dev is a pointer in 4.0 + + Signed-off-by: Steve Lhomme + +commit 3b520d80d24544ed63d321c0c427b1c567f501a7 +Author: Steve Lhomme +Date: Tue Apr 11 09:07:59 2023 +0200 + + direct3d11: add video processor based scaler + + The VideoProcessor may use some special scaling in hardware that might do a + better job than the linear sampler in the shader. + + Co-authored-by: Chilledheart + + (cherry picked from commit 1f7f849ce18cbdd47c1bdf0a4ffcb0dbdbb6aa6e) (edited) + + edited: + * 3.0 doesn't have DXGI_MAX_SHADER_VIEW + * 3.0 doesn't have DXGI_RGB_FORMAT or DXGI_YUV_FORMAT + * 3.0 doesn't have DXGI_CHROMA_GPU + * use a memcmp of the vout_display_place_t instead of vout_display_PlaceEquals() + * pass a vout_display_cfg_t instead of vout_display_placement which does + not exist in 3.0 + * set is_display_filled instead of VLC_VIDEO_FIT_SMALLER + * D3D11_AllocateResourceView is called D3D11_AllocateShaderView in 3.0 + * 3.0 uses a picture_sys_t instead of picture_sys_d3d11_t + * 4.0 also has the meson changes + + Signed-off-by: Steve Lhomme + +commit a6870065df50ba5de59791d14291be002c99f120 +Author: Steve Lhomme +Date: Tue Apr 11 09:24:29 2023 +0200 + + direct3d11: keep the format used with the pic_quad + + (cherry picked from commit 794d897d07ff45b0c60bcbddec1e0705aa157853) + + Signed-off-by: Steve Lhomme + +commit fb2552f0b257ef44244e7d3892a039f10e0b36df +Author: Steve Lhomme +Date: Wed Mar 22 11:18:43 2023 +0100 + + direct3d11: add an option to select the upscaling quality + + D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT is smoother but a bit slower. + Users may prefer sharper/blockier outputs. + + We only force point sampler to the blocky version as SPUs also use this + to make the text smoother. + + (cherry picked from commit b86a57876f2cff622be637a66aaf6973ec2018b5) + + Signed-off-by: Steve Lhomme + +commit 92e523bd8a7cd6120b7f2c60ca7aee14919f017b +Author: Steve Lhomme +Date: Fri Apr 7 13:13:26 2023 +0200 + + direct3d11: keep the format used to create the pool + +commit 7ad94cd1d71cb4ba93ee3271dffae509ca902ba6 +Author: Steve Lhomme +Date: Tue Apr 11 10:39:46 2023 +0200 + + vout/win32: allow forcing the source size + + (cherry picked from commit d4374090ee1ae8a28b46236a89418df3a722871c) (edited) + + edited: + * the format is not passed to CommonInit() in 3.0 + + Signed-off-by: Steve Lhomme + +commit 254d230fff492d20958930d03561400e9bdb63fe +Author: Steve Lhomme +Date: Tue Apr 11 08:49:30 2023 +0200 + + direct3d11: move code to avoid forward declaration + + No functional changes. + +commit aa52c64339a90a9483ee9a98cd724211956d0cf9 +Author: Steve Lhomme +Date: Wed Apr 12 07:43:21 2023 +0200 + + win32/common: only get the size of the Window + + The top/left is always zero. + +commit 188c5b9612c3b08c6cd009d73f952067953ca638 +Author: Steve Lhomme +Date: Fri Apr 7 08:53:00 2023 +0200 + + direct3d11: get source D3D11_TEXTURE2D_DESC early + + (cherry picked from commit e4ba931b3d2a6604471f196ddabdedcc9d181f8a) (edited) + + edited: + * the direct3d11 code is in C++ in 4.0 (GetDesc called directly) + * the pic_quad is split in generic and D3D11 parts in 4.0 + + Signed-off-by: Steve Lhomme + +commit 490bcd81995b56db02dc7679fa7316c39140804a +Author: Steve Lhomme +Date: Wed Feb 12 16:09:56 2020 +0100 + + d3d11_fmt: avoid forcing COBJMACROS on files including the header + + (cherry picked from commit 65048467c5f394fcc5c577e69a732bdfd1f1dd70) (edited) + + edited: + * FindD3D11Format doesn't use an undef in 4.0 + + Signed-off-by: Steve Lhomme + +commit 371c07878715ec674a48ddeaf683f0ed26bc65e0 +Author: Steve Lhomme +Date: Thu Apr 6 11:40:47 2023 +0200 + + d3d11_fmt: allow build D3D11 modules with C++ + + as in 6b7a6d86ae30109bed34fec0b5ffc1f013ca4a81 + +commit 70de1313be8e1d4bc90aeea6ea67a57db1924b05 +Author: Maxime Chapelet +Date: Wed Apr 5 11:32:57 2023 +0200 + + contrib: soxr: fix neon detection for aarch64 hosts + + What we have : + Given the cmake simd detection module check `CMAKE_SYSTEM_PROCESSOR` to match "arm" prefixed hosts + When `DETECT_SIMD32_C_FLAGS` test is performed by cmake for aarch64 Darwin hosts + The test fails and `WITH_CR32S` is defined to 0 in `soxr-config.h` + + What is expected : + Given the cmake simd detection module check `CMAKE_SYSTEM_PROCESSOR` to match "aarch64" hosts + When `DETECT_SIMD32_C_FLAGS` test is performed by cmake for aarch64 Darwin hosts + The test succeeds and `WITH_CR32S` is defined to 1 in `soxr-config.h` + + When soxr is used on Darwin arm64 platforms (iOS, macOS on Apple Silicon), the expected resampler engine to be used is cr32s. + Without this patch, cr32 is used instead, because in `soxr-config.h`, `WITH_CR32S` is defined to 0. + Considering we use "aarch64" for Darwin arm64 hosts in contribs, these changes are an attempt to fix this. + + (cherry picked from commit 2837692900e62812f0f6f16bc7c1b5147b11d08e) + +commit 7141328fb8376e6ee8ed5b7efdda1bb879ceb222 +Author: Francois Cartegnie +Date: Thu Apr 20 16:10:10 2023 +0700 + + demux: mp4: tag Apple chapters as non defaultable SPU + + refs #25561 + +commit 0808ae2ac54a6605099fbf95a362cc0d7ccbd9f8 +Author: Steve Lhomme +Date: Mon Apr 17 13:01:01 2023 +0200 + + dav1d: always use buffers with the max resolution + + When the super resolution of AV1 is used, some frames may be encoded smaller + than the max resolution, but they are actually decoded at the max resolution + by dav1d. So we need to provide a buffer large enough. + + Ref. #28002 + +commit c4cbdcb739b2dcc934a8ea21ec0ae4fbc31de9ef +Author: Steve Lhomme +Date: Tue Jun 5 08:59:45 2018 +0200 + + demux:mkv: display segment/family UID using 64 bits + + they're supposed to be using 128 bits + + (cherry picked from commit 91dc3d55319b148c045b9c586773b9e9bc9b90d5) + Signed-off-by: Tristan Matthews + +commit f2e1a7417dc6e6035590e25c997d9c08a63713af +Author: Steve Lhomme +Date: Tue Jun 5 08:58:46 2018 +0200 + + demux:mkv: log the UIDs are hexadecimal + + (cherry picked from commit d62d49e38bffe5b574c93b768d7294f14b9f3244) + Signed-off-by: Tristan Matthews + +commit b6b5b788bca0592f66c3929ff470e6d94d453805 +Author: Steve Lhomme +Date: Fri Sep 30 13:10:08 2022 +0200 + + contrib: ebml: update to 1.4.3 + + (cherry picked from commit f7eb37ed0b9bdc114ac3a7f0e1378e449f78f733) + + Signed-off-by: Steve Lhomme + +commit c2fe3091ab71188ba646d8bbc2120cd1dc5af236 +Author: Hugo Beauzée-Luyssen +Date: Tue Jan 18 17:22:33 2022 +0100 + + contribs: ebml: Fix build with GCC11 + + Already applied upstream + + (cherry picked from commit 6834f9a2b61b025fb21ee94da905d2e06f815633) + + Signed-off-by: Steve Lhomme + +commit 3dc1d3c4e2e8e62a3e41014312bf4047c5b15611 +Author: Steve Lhomme +Date: Wed Jun 3 10:39:13 2020 +0200 + + contrib: aribb25: don't build the sample app + + No idea why the test code is built with -Werror when the code is not clean. + + (cherry picked from commit c81a99f2c9a31b034ea1b3803e133dec9b3d107a) + + Signed-off-by: Steve Lhomme + +commit 141e60918312233580a583ebb6e09bd5d23e58e7 +Author: Steve Lhomme +Date: Thu May 28 09:59:55 2020 +0200 + + contrib: aribb25: backport upstream patches + + Don't build a test program in the library! + + Edited the first patch to remove the .gitignore patching. + + (cherry picked from commit 301b3f15f9ffe5ac2f07460ff2341b4869aa4728) + + Signed-off-by: Steve Lhomme + +commit b4b1f0839b5b3733481db8cbc352b97812e4b9a9 +Author: Steve Lhomme +Date: Thu Apr 13 06:15:47 2023 +0200 + + contrib: qt: fix windows build with gcc 12 + + Redefining the system FILE_ID_INFO gives an error. We only need to define it + when it's not available (builds before win8) + +commit dfee8741f804f8307a7a6cfac512f98863eb707f +Author: Steve Lhomme +Date: Thu Apr 13 05:54:57 2023 +0200 + + contrib: d3d11: include pthreads IDL + + They are likely more up to date and always there when we build. + Ultimately we should just use the ones in there. + +commit b16365ae32fd21d1ebad7411c498225e89544d7f +Author: Steve Lhomme +Date: Thu Apr 13 06:30:23 2023 +0200 + + package/win32: build.sh: force Win XP SP1 compatibility + + Recent mingw64 with gcc12 (Debian) defaults to Windows 10. We need to force + the toolchain to use only WinXP API's (apart from local overrides). + + This reverts d3ee976c416212924fb2f97bae2bd6c946bbddb5 but forces the proper + minimum version for 3.0. + +commit 5478dc024914c707b97fa8326c70fc00673725b1 +Author: Maxim Biro +Date: Sun Apr 2 12:26:00 2023 -0400 + + qt: allow opening links from module's help text + + Primarily useful for out-of-tree plugins, in case they want to link to + plugin's home page, bug tracker, donation page, etc. + + refs #27798, !3203 + + Backport of a feature doing only minimal changes: + faf8b85ac3e55bc95cfd80f914e8537c47d2c1a5 + caf143311e00acf24533b498890df2e57a7a80e2 + +commit f9e125db29f9f0d57e6ed3398a80f825e6710dab +Author: Steve Lhomme +Date: Thu Apr 6 09:40:04 2023 +0200 + + interop_dxva2: force win7 API compatibility + + Otherwise in 3.0 builds we target WinXP and the API is not available. + + Similar to 8241910b7bac3781ea0c4eb1503a23560a7a9412 + +commit d803f6aab52ee88edbf8b140b4c8f7d83f384175 +Author: Steve Lhomme +Date: Mon Mar 20 13:02:04 2023 +0100 + + interop_dxva2: add comments about the processor output values + + The same code in direct3d9 uses an output format that can vary. + + (cherry picked from commit 2e335eba28ebe1bcf0028385f70838dcf310e847) + + Signed-off-by: Steve Lhomme + +commit 111f34d3a2026d56a0625f5952bd93fabdf9b8c4 +Author: Steve Lhomme +Date: Thu Mar 16 13:39:15 2023 +0100 + + d3d9: use the official typedef for DXVAHD_CreateDevice() + + It doesn't exist in mingw so we define it in that case. + + (cherry picked from commit dd8297d27a67d9bfa0a9a217c8ad37db45620e24) + + Signed-off-by: Steve Lhomme + +commit 55bfc1ad144743ddb5b76a38ff1d3f053f79bdec +Author: Steve Lhomme +Date: Mon Mar 20 12:54:39 2023 +0100 + + d3d9: explicitly set the processing input type + + We do the processing on video files, not "graphics" generated sources. + + (cherry picked from commit b86fbe2e7a40caab99aab8a41dce657ed11a91db) (rebased) + + rebased: + * 3.0 uses b_color_range_full instead of color_range + + Signed-off-by: Steve Lhomme + +commit de34414d464e2ff00e8c6d55f5536212ac557355 +Author: Steve Lhomme +Date: Mon Mar 20 12:52:30 2023 +0100 + + d3d9: fully initialize DXVAHD_BLT_STATE_INPUT_COLOR_SPACE_DATA + + Although we set all known usable bits, it seems that leaving reserved bits + "uninitialized" doesn't work in some case. In particular with LLVM builds, + which results in bogus output. + + (cherry picked from commit 367b7e8eeafcd36e876be2d4e0ec2dfd978cc2cb) (edited) + + edited: + * 3.0 uses b_color_range_full instead of color_range + + Signed-off-by: Steve Lhomme + +commit c41bbfd59e60f15b6b715880d84ccf2ef3602bf1 +Author: Steve Lhomme +Date: Thu Mar 16 13:29:59 2023 +0100 + + d3d9: fully initialize DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE_DATA + + Although we set all known usable bits, it seems that leaving reserved bits + "uninitialized" doesn't work in some case. In particular with LLVM builds, + which results in bogus output. + + Co-authored-by: Pierre Lamot + (cherry picked from commit a7de762a710debc733f2b2ce5720f92ccab7f566) (edited) + + edited: + * 3.0 doesn't have the GPU callbacks to tweak the output format colorimetry + + Signed-off-by: Steve Lhomme + +commit f007cf9ab5bf7d5f9dff7375f558602dc22335b8 +Author: Steve Lhomme +Date: Mon Mar 20 11:38:45 2023 +0100 + + contrib: mingw64: patch dxvahd.h before mingw-w64 11 + + The releases before 11 had bogus dxvahd + DXVAHD_STREAM_STATE_xxx_COLOR_SPACE_DATA structures. This was confusing the + initialization with LLVM. + + (cherry picked from commit 96a19e9410ea372d735a352b33fb6ad5a3ce5760) (edited) + + edited: + * in 3.0 the mingw-w64 files are still in the pthreads directory + + Signed-off-by: Steve Lhomme + +commit a2c6fd94436ff38c6f8647605889476937cfb520 +Author: Steve Lhomme +Date: Mon Mar 16 13:26:37 2020 +0100 + + opengl: dxva2: fix indentation after previous commits + + No functional changes + + (cherry picked from commit f707c6f002defa3f093b028014a4b3af90e65d14) + + Signed-off-by: Steve Lhomme + +commit cf08970c72e090900ca7326c2608c3894eee0c17 +Author: Steve Lhomme +Date: Mon Mar 16 13:24:43 2020 +0100 + + opengl: dxva2: use DXVA-HD instead of StretchRect for NVIDIA GPUs + + The StretchRect we're using has the same issue as with the D3D9 vout. + + (cherry picked from commit e595beb4e97391fd0b86caa1cc02955238908cb3) (edited) + + edited: + * 3.0 uses opengl_tex_converter_t and not vlc_gl_interop + * 3.0 uses b_color_range_full and not color_range + + Signed-off-by: Steve Lhomme + +commit 3e33bcd48373c0f3d3ace9c7b549a63395188b84 +Author: Steve Lhomme +Date: Mon Mar 16 13:20:23 2020 +0100 + + opengl: dxva2: always use the IDIRECT3DDEVICE9EX with DXVA interop + + (cherry picked from commit 15132bbffb0f89bfa9ef7dd79221235e501ee8e6) (edited) + + edited: + * adapted patch as we don't use a decoder device/video context + + Signed-off-by: Steve Lhomme + +commit 16769e2605a87d1e45c9fc495549259a1d3f9267 +Author: Steve Lhomme +Date: Mon Mar 16 13:18:32 2020 +0100 + + opengl: dxva2: make sure we can handle the conversion in StretchRect + + (cherry picked from commit b7a56bc889e4cc02f3bc626c20abb01ee5b394d8) (edited) + + edited: + * 3.0 doesn't use a decoder device/video context + * 3.0 doesn't know the exact D3DFORMAT on open but we deduce it from the chroma + + Signed-off-by: Steve Lhomme + +commit 02f5fac73382b95c1442001f6ae058a595f15db8 +Author: Steve Lhomme +Date: Mon Mar 16 12:02:22 2020 +0100 + + direct3d9: move the DXVA2 OpenGL Interop module in its own file + + It shares nothing with the D3D9 module and will never be loaded at the same time. + + No functional changes. + + (cherry picked from commit 886587dc8591ee3bada2bdef660cd0461d7249e7) (edited) + + edited: + * 3.0 had a different name for the DXVA2 interop module + * the OpenGL interop name in 3.0 is "glconv", not "glinterop" + * 3.0 has the interop declarations in opengl/converter.h + * 3.0 uses opengl_tex_converter_t instead of vlc_gl_interop + + Signed-off-by: Steve Lhomme + +commit 3341404c59fc187fa912c8431ade6bf429fe445a +Author: Steve Lhomme +Date: Mon Mar 2 15:41:45 2020 +0100 + + d3d9_fmt: keep the adapter info while it's loaded + + No need to reload the same thing many times. + + (cherry picked from commit 60c0cb10694c9fc4314dbed080fe802fbb5a4fef) (edited) + + edited: + * 3.0 doesn't use a decoder device/video context + * 3.0 didn't show the driver version in dxva2 + + Signed-off-by: Steve Lhomme + +commit 266527271073e3bf3c7462ffea24b2a1314b9bb6 +Author: Steve Lhomme +Date: Tue Mar 21 17:18:08 2023 +0100 + + d3d9: move the pool creation in libd3d9_common + +commit e8b689c0c1288a4921834029292333169d9ceff5 +Author: Steve Lhomme +Date: Fri Oct 4 10:13:37 2019 +0200 + + directx_va: check the bit depth matches what the decoder can handle + + (cherry picked from commit 53b022588b40e7997564e5b75f416846c22651a2) (rebased) + + rebased: + * in 3.0 the directx_sys_t is not passed as const + + Signed-off-by: Steve Lhomme + +commit 529391522a17edb523e2da9f49756f5a4590796f +Author: Steve Lhomme +Date: Fri Oct 4 10:04:28 2019 +0200 + + avcodec: va: pass the software format description to the VA + + The codec profile alone doesn't always give information on the bit depth or + chroma subsampling (see HEVC Range Extension). + + (cherry picked from commit c8a1298cec05f2947a5f9708fcb12c99e20490ca) (edited) + + edited: + * on 3.0 the picture_sys_t is passed to the VA + * on 3.0 the directx_sys_t is not const + * on 4.0 FindVideoServiceConversion returns the matching decoder GUID + + Signed-off-by: Steve Lhomme + +commit fb75641be04c01856e5d190e741e515909f1e49b +Author: Thomas Guillem +Date: Tue Jan 3 15:20:27 2023 +0100 + + audiounit: fix surround input on stereo output + + setPreferredOutputNumberOfChannels can fail, don't configure more + channels than accepted. The OS will drop the extra channels instead of + downmixing it. + + When I first tested it, the apple TV was configured to always accept + surround even with a stereo output (Change Format = Off) but this is not + necessarily the case. + + (cherry picked from commit 6c08c24b075157241eaca3543bb77107a1b9b853) + Signed-off-by: Thomas Guillem + +commit 99b63d64e0e44b09ebc33ae389f9581d5040b197 +Author: Tristan Matthews +Date: Fri Mar 24 11:20:12 2023 -0400 + + contrib: vpx: update to 1.13.0 + + This release includes more Neon and AVX2 optimizations, adds a new codec + control to set per frame QP, upgrades GoogleTest to v1.12.1, and includes + numerous bug fixes. + + Release notes: + https://chromium.googlesource.com/webm/libvpx/+/refs/tags/v1.13.0 + + (cherry picked from commit 5423bb9b96da2a4a93f6b984b0f98296f22abdd1) + +commit d6a0d3b2585eb118475f31c7d47334366bba28cd +Author: Francois Cartegnie +Date: Fri Mar 24 15:48:36 2023 +0100 + + demux: hls: use internal max resolution define instead of raw value + + (cherry picked from commit fcd6a9b637c15d49bb7be23e10d5d3085b5a7c72) + +commit f31228b9b3a225cccf15354d12793fffb7874adf +Author: Francois Cartegnie +Date: Fri Mar 24 15:46:30 2023 +0100 + + demux: hls: fix lazy loaded playlists timescale + + (cherry picked from commit 75f57e3a9546dc3d9f4d696f59802af5bc19b539) + +commit ce21489a3bc03b89c46b155d2151531eb83860e9 +Author: Steve Lhomme +Date: Wed Mar 22 15:31:52 2023 +0100 + + direct3d11: separate the code to set shader samplers + +commit 71e4ef41d28ad691b57b60014371f825c4793803 +Author: Steve Lhomme +Date: Wed Mar 22 14:01:24 2023 +0100 + + direct3d11: fix missing fence reset + +commit 8613ddd7bd63ced08a9c5b5e6ffea71c8174a9b7 +Author: Steve Lhomme +Date: Mon Feb 3 15:12:55 2020 +0100 + + d3d11: use the stored DXGI Adpater Description + + Instead of reading it each time. + + (cherry picked from commit 25640567c2e8726539b9eb0656505f13cbe245a2) (edited) + + edited: + * the 3.0 directx_va_Setup() call is different + * 3.0 uses DxDescribe to get the decoder string + + Signed-off-by: Steve Lhomme + +commit 984f8d2734b634f75510f7399923da06698af182 +Author: Steve Lhomme +Date: Mon Feb 3 15:07:10 2020 +0100 + + d3d11_fmt: keep the DXGI adapter description with the device + + Since we always check it. + + Read it as soon as the d3d11_device_t is created. + + (cherry picked from commit fc6194d56c799b061222c7312f657ec4339fd521) (edited) + + edited: + * D3D11_GetDriverVersion is kept public as we don't use a decoder device + * we have dummy D3D11_GetDriverVersion for UWP in 3.0 + * we don't have a DXGI adapter when creating the ID3D11Device + + Signed-off-by: Steve Lhomme + +commit cf738839f07ef27905a89c6eb2a6da68d5ed4223 +Author: Steve Lhomme +Date: Mon Feb 3 08:29:03 2020 +0100 + + d3d11_fmt: always initialize DXGI debug fields + + (cherry picked from commit 94ab4cda9e8fa129f85c52eb38cea699018b51d7) + + Signed-off-by: Steve Lhomme + +commit 90398c75899d549b60e781c4e07a6795e673f2a2 +Author: Steve Lhomme +Date: Tue Jan 7 09:55:46 2020 +0100 + + d3d11_fmt: allow logging DXGI/D3D11 resources at any time + + (cherry picked from commit 9d7a6264cbbd8387a4772d665f4949f1d081b8a7) (rebased) + + rebased: + * pDXGIDebug is released on current 3.0 + + Signed-off-by: Steve Lhomme + +commit 3e483547037e49f8ef828f2f0455593400968cf4 +Author: Steve Lhomme +Date: Tue Mar 21 09:27:25 2023 +0100 + + d3d11: fix ID3D11Device leak in UWP mode + + The ID3D11DeviceContext_GetDevice() already gets a reference to the device. + We don't do add one manually. + +commit 85868dfb0319dced501a78dfd2ee6432d6be90f3 +Author: Alaric Senat +Date: Tue Mar 14 13:49:10 2023 +0100 + + taglib: wav: fix RIFF INFO tags parsing + + TagLib does not provide an union of both ID3v2 and INFO tags via the + usual `File::tag()` method. Their justification lies in the code for + now: + + ```cpp + /*! + * Returns the ID3v2 Tag for this file. + * + * \note This method does not return all the tags for this file for + * backward compatibility. Will be fixed in TagLib 2.0. + */ + ID3v2::Tag *tag() const; + ``` + + To support WAV files providing RIFF INFO tags, we must specifically + parse them before TagLib 2.0 (not released yet). + + Fixes #25690 + + (cherry picked from commit a26e2ba370d898dda04c718176af7d2e329dab7a) + +commit 06dff2e5d7561ed31a067b20af89687a25a8b9b2 +Author: Alaric Senat +Date: Tue Mar 14 13:43:02 2023 +0100 + + taglib: move default meta access to a function + + No functional changes. + + (cherry picked from commit 294cbdbaee0209bc88ca7bec9164da8da4ac44ef) + +commit fdfb5bc253748466538b7d923c2b7292510b6d00 +Author: Tristan Matthews +Date: Mon Mar 13 14:45:29 2023 -0400 + + mux: avformat: default avformat-reset-ts to true + + This is a workaround for #12713, which 4.0.x doesn't require. + +commit eaa89a42ae0d25fd5480e5f5212a6fb2055d9e7b +Author: Andrew Sun +Date: Sun Feb 19 19:32:14 2023 +0000 + + inhibit/dbus: fix service and path + + According to https://web.archive.org/web/20080828095706/https://people.freedesktop.org/~hughsient/temp/power-management-spec-0.2.html the correct service name does not include `.Inhibit` and the path includes `/Inhibit`. + + This essentially reverts beec9e78518b56e7f4db897b55b5e0d46ae61bf8 + + + (cherry picked from commit 77a2d21b59fb9f1991608009c00931a1dab0ea3e) + +commit 7a086098538c405992d9b1841e75bccb96fc85f1 +Author: Steve Lhomme +Date: Thu Feb 16 08:13:03 2023 +0100 + + do not expand the Id on checkout for any file + + no README even had it anyway + + This is easier/faster than backporting 53632798050d57d11e1b7e09009ba8a7e0cc1e40. + + See https://www.git-scm.com/docs/gitattributes#_ident + + (cherry picked from commit 777f36c15564b076bf13af6641493d97cd5ee224) + +commit 4b2e6df38979f3082a25781893baae75bef79693 +Author: Pierre Lamot +Date: Thu Feb 16 14:59:49 2023 +0100 + + rawvid: fix rounding division when calculating pitch + + formats like NV12 where num and den are 2 had the wrong pitch + + size is divided then multiplied, consistently with `rawvideo` decoder + + (cherry-picked from commit 128f7ff6e9ee3c33098c2cc9896116374f04eb56) + +commit 96df5fd9570b13e9be72f0836bc69ae47a39038e +Author: Alexandre Janniaux +Date: Mon Feb 6 09:28:48 2023 +0100 + + qt: plugins: reset selection when reloading extensions + + When selecting an extension and reloading them afterwards, the selection + points to invalid data but still represent a valid index for Qt, so the + button More Information is still clickable and will lead to a crash. + + Reset the selection when reloading to prevent that. + + Fixes #27830 + + Cherry-picked from commit 4cca6109e2a003c5e7260a9d760b2feee22ed036 via + manual backport. + +commit 792cddc63f22c700da51dbecf0e3ca27253ad3de +Author: Aleksey Vasenev +Date: Tue Feb 14 00:27:05 2023 +0530 + + taglib: Opening a file for reading if possible + + When metadata is read, the file is opened for writing. This causes the + file to be deleted in FS-Cache when caching network file systems. + + Fixes #27848 + +commit 8f30d6411fa95b60bf821f5fd02c4d7dcae34286 +Author: Thomas Guillem +Date: Wed Feb 15 11:56:08 2023 +0100 + + input: seek to the current time when resuming from next-frame + + This fixes video glitches. It won't work for all input sources (but it's + not critical). + +commit e9cf90770ff64614c648109a59f10d7c1a18b93d +Author: Thomas Guillem +Date: Wed Feb 15 11:56:02 2023 +0100 + + es_out: don't pace when using next-frame + + This fixes hiccups after few seconds when hitting next-frame in repeat mode. + +commit cf041857bc4375f0f554e2b7512e33d3b4d89b3b +Author: Thomas Guillem +Date: Wed Feb 15 11:53:34 2023 +0100 + + es_out: report timing when using next-frame + +commit 87b7b422596f267cef392239737b226fe05c7ffa +Author: Thomas Guillem +Date: Wed Feb 8 12:51:29 2023 +0100 + + es_out: don't decode paused decoders + + This avoid to fill up the decoder FIFO for nothing (ESes will be flushed + on resume). + + (cherry picked from commit ff1316724f3520ae0220fd693b6b589d56240561) + Signed-off-by: Thomas Guillem + +commit feaa1eea1020cecedcfbf78140df194a36dd679a +Author: Thomas Guillem +Date: Tue Feb 7 14:07:46 2023 +0100 + + input: add a workaround for next-frame + + Don't hack the buffering values, but fake the buffering state: tell the + input_thread to demux() until the vout has a picture. + + Fixes #2951 + + (cherry picked from commit ea93b2c847880581b55c433b3aa0f315c6449cf3) + Signed-off-by: Thomas Guillem + +commit 62ccae7d09fa58cd65c5c2d2cab8f58017157468 +Author: Steve Lhomme +Date: Mon Feb 13 14:06:36 2023 +0100 + + goom: initialize the video format with video_format_Init() + + Do not rely on calloc to get proper values. + + (cherry picked from commit 61c9cbe24f6830cd745469e089470022e8a1892a) + +commit 8bf721b9af8888d1378a33aa21b832666e5e2c25 +Author: Steve Lhomme +Date: Mon Feb 13 14:02:56 2023 +0100 + + goom: explicitely set the output as full range + + (cherry picked from commit 6dc1c5a457b44aa3850aca8c611f7bc2125a5701) + +commit 93bd3afce05eb136b5452a957a377ffdfff4d3d1 +Author: Steve Lhomme +Date: Mon Feb 13 14:02:03 2023 +0100 + + goom: use plane_CopyPixels() + + The destination stribe may not be the same as the source. + + (cherry picked from commit 82bca6ae86ffff4f4006f301249f6f7e6f13a8b7) + +commit c969cbf95d3dca95f15bddce8a34e910c4aa1737 +Author: Rémi Denis-Courmont +Date: Sun Oct 28 16:33:39 2018 +0200 + + goom: keep track of video format + + (cherry picked from commit d7aca8699eadccb7b57491b8e202cfc77ebccb01) + +commit 4b8069d7a2ad688ba7686a804a06072d392b12a0 +Author: Steve Lhomme +Date: Tue Feb 14 11:09:54 2023 +0100 + + direct3d9: keep the texture size for GetPictureWidth/Height calls + + fixes #27632 + +commit 424338663580e15e5deddc75353892823ed64a6a +Author: Steve Lhomme +Date: Mon Feb 13 17:28:02 2023 +0100 + + direct3d11: mark winrt pointer options as volatile + + It makes them private and hidden from the user. + + Fixes #27615 + +commit 9568550010bb92e667d01de2b1e40c53147b6a52 +Author: David Fuhrmann +Date: Sun Feb 5 14:54:29 2023 +0100 + + contrib: breakpad: Fix build with newest Xcode + + The latest Xcode 14 / macOS 13 SDK declares quite a bunch of c calls as + deprecated for security reasons, like sprintf, which makes compilation + failing. Disable "-Werror" for Breakpad builds, to downgrade those errors to + warnings. + + fixes #26859 + + (cherry picked from commit 7a0445383b3b8487fa13e9451caccd8ffe981f4c) + +commit 8132db81e580bb7f29b678cbbaff55f167494313 +Author: Francois Cartegnie +Date: Tue Feb 18 22:09:51 2020 +0100 + + codec: dav1d: MDCV contains SmDm + + logical :/ + + (Cherry-picked from 8634945c56cdfbc75c64815e913448d8ea7926ac) + Signed-off-by: Vibhoothi + +commit 606724cc53aa2f42102668f09fcfa30016926280 +Author: Francois Cartegnie +Date: Thu Feb 13 14:19:59 2020 +0100 + + codec: dav1d: apply HDR CLL + + (Cherry-picked from c1973ce55e426b793054d8ad22cd0b473af0aff2) + Signed-off-by: Vibhoothi + +commit fb59da1ce923a775ca02f239fc7fa36e04ec693d +Author: Francois Cartegnie +Date: Thu Feb 13 14:15:22 2020 +0100 + + codec: dav1d: apply HDR MDCV + + (Cherry-picked from 8a1cad5e825d74275dfd0f187a8e2c6baa005cb2) + Signed-off-by: Vibhoothi + +commit 6a661074216638cf9f3e25c6b9dc842e0a81fd0a +Author: Tristan Matthews +Date: Fri Jan 27 01:04:03 2023 -0500 + + dav1d: fix gbrp mapping + + Fixes #27586 + + (cherry picked from commit f28a4b2b34be9cc3d342c258d698c8f34751205e) + +commit 4c12f2eacbb094929e5066e9be285f9eded50f35 +Author: Jorge Bellon +Date: Fri Jan 6 23:29:41 2023 +0000 + + DBus control module: return DBus error message instead of entering an infinite loop + +commit 7a1c58acf27f2c9e21751c129236a0aa26f21502 +Author: Jorge Bellon-Castro +Date: Mon Jan 2 16:18:22 2023 +0100 + + DBus control: add more TrackList signals + + Implements the following signals for the + org.mpris.MediaPlayer2.TrackList interface: + + - TrackAdded: a track was inserted to the list + - TrackRemoved: a track was removed from the list + +commit 0f6129e0745fb09b6a6b2b229abad4bc8f3a0478 +Author: Jorge Bellon-Castro +Date: Mon Jan 2 15:34:07 2023 +0100 + + DBus control: do not query index of item if known + + The track index is sometimes known when serialising a track's metadata. + This moves the index query outside the metadata serialisation function + when necessary. + +commit 70c34c3519e055115d1aef61ff0b6a692424d8d3 +Author: Jorge Bellon-Castro +Date: Mon Jan 2 15:26:02 2023 +0100 + + DBus control: Extract method ProcessPlaylistChanged + + Extract switch body for track append and track remove events. + This simplifies adding independent logic to both cases. + +commit 18a5a49a6d9d0a2f9e5890faca567cb805417f1f +Author: Thomas Guillem +Date: Wed Jan 4 16:45:59 2023 +0100 + + audiounit: fix swap_rear_surround check + + (cherry picked from commit a4b715b3e775b6b63ff3ac5a96383d0ecbb7a0ac) + Signed-off-by: Thomas Guillem + +commit 1d27f9aa011e84a6e519ef7f137c21200e5866f4 +Author: Thomas Guillem +Date: Thu Dec 1 16:35:01 2022 +0100 + + coreaudio: add missing chain initialisation + + (cherry picked from commit 27009027ab57ea827b871ca73ee9636b383292c3) + Signed-off-by: Thomas Guillem + +commit 65ea8d19d91ac1599a29e8411485a72fe89c45e2 +Author: Niklas Haas +Date: Wed Dec 28 17:58:47 2022 +0100 + + vout_opengl: add compatibility alias for libplacebo v5 + + This fixes compilation for now, albeit with many deprecation warnings. + It will probably break again whenever libplacebo v6 drops these + deprecated fields as well, but hopefully VLC v4 will be released by + then. + + Fixes: #27624 diff -Nru vlc-3.0.18/doc/Makefile.am vlc-3.0.20/doc/Makefile.am --- vlc-3.0.18/doc/Makefile.am 2022-07-23 08:04:37.000000000 +0000 +++ vlc-3.0.20/doc/Makefile.am 2023-08-05 10:18:45.000000000 +0000 @@ -45,6 +45,7 @@ ChangeLog-2020 \ ChangeLog-2021 \ ChangeLog-2022 \ + ChangeLog-2023 \ $(NULL) man1_MANS = \ diff -Nru vlc-3.0.18/doc/Makefile.in vlc-3.0.20/doc/Makefile.in --- vlc-3.0.18/doc/Makefile.in 2022-10-13 18:40:53.000000000 +0000 +++ vlc-3.0.20/doc/Makefile.in 2023-10-30 07:26:13.000000000 +0000 @@ -1031,6 +1031,7 @@ ChangeLog-2020 \ ChangeLog-2021 \ ChangeLog-2022 \ + ChangeLog-2023 \ $(NULL) man1_MANS = \ diff -Nru vlc-3.0.18/extras/analyser/vlc.vim vlc-3.0.20/extras/analyser/vlc.vim --- vlc-3.0.18/extras/analyser/vlc.vim 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/extras/analyser/vlc.vim 2023-02-11 09:33:17.000000000 +0000 @@ -23,7 +23,7 @@ syn keyword cConstant VLC_ESTATUS VLC_EEXIT VLC_EMODULE VLC_EOBJECT syn keyword cConstant VLC_ENOOBJ VLC_ENOMOD VLC_VAR_ADDRESS " custom types - syn keyword cType vlc_fixed_t mtime_t byte_t dctelem_t ssize_t off_t + syn keyword cType vlc_fixed_t vlc_tick_t byte_t dctelem_t ssize_t off_t syn keyword cType vlc_bool_t vlc_fourcc_t vlc_value_t " Core custom structures syn keyword cType vlc_t libvlc_t vlc_object_t vlc_error_t vlc_status_t diff -Nru vlc-3.0.18/extras/package/macosx/build.sh vlc-3.0.20/extras/package/macosx/build.sh --- vlc-3.0.18/extras/package/macosx/build.sh 2022-02-21 09:19:30.000000000 +0000 +++ vlc-3.0.20/extras/package/macosx/build.sh 2023-02-11 09:33:17.000000000 +0000 @@ -341,6 +341,11 @@ info "Preparing VLC.app" make VLC.app +# Workaround for macOS 10.7: CFNetwork only exists as part of CoreServices framework +if [ "$ARCH" = "x86_64" ]; then + install_name_tool -change /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices VLC.app/Contents/MacOS/lib/libvlccore.dylib +fi + if [ "$PACKAGETYPE" = "u" ]; then info "Copying app with debug symbols into VLC-debug.app and stripping" rm -rf VLC-debug.app diff -Nru vlc-3.0.18/extras/package/win32/NSIS/vlc.win32.nsi.in vlc-3.0.20/extras/package/win32/NSIS/vlc.win32.nsi.in --- vlc-3.0.18/extras/package/win32/NSIS/vlc.win32.nsi.in 2021-03-26 12:45:59.000000000 +0000 +++ vlc-3.0.20/extras/package/win32/NSIS/vlc.win32.nsi.in 2023-09-30 09:28:38.000000000 +0000 @@ -416,7 +416,7 @@ !insertmacro InstallFile axvlc.dll !insertmacro CloseUninstallLog @HAVE_WIN64_FALSE@ RegDLL "$INSTDIR\axvlc.dll" -@HAVE_WIN64_TRUE@ ExecWait 'regsvr32.exe /s "$INSTDIR\axvlc.dll"' +@HAVE_WIN64_TRUE@ ExecWait '"$SYSDIR\regsvr32.exe" /s "$INSTDIR\axvlc.dll"' ${MementoSectionEnd} !endif SectionGroupEnd @@ -836,7 +836,7 @@ ;remove activex plugin @HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll" -@HAVE_WIN64_TRUE@ ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"' +@HAVE_WIN64_TRUE@ ExecWait '"$SYSDIR\regsvr32.exe" /s /u "$INSTDIR\axvlc.dll"' Delete /REBOOTOK "$INSTDIR\axvlc.dll" ;remove mozilla plugin diff -Nru vlc-3.0.18/extras/tools/SHA512SUMS vlc-3.0.20/extras/tools/SHA512SUMS --- vlc-3.0.18/extras/tools/SHA512SUMS 2020-10-24 18:21:13.000000000 +0000 +++ vlc-3.0.20/extras/tools/SHA512SUMS 2023-08-05 10:03:51.000000000 +0000 @@ -16,5 +16,5 @@ e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd nasm-2.14.tar.gz d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz -172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889 meson-0.55.1.tar.gz +3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 ninja-1.8.2.tar.gz diff -Nru vlc-3.0.18/extras/tools/packages.mak vlc-3.0.20/extras/tools/packages.mak --- vlc-3.0.18/extras/tools/packages.mak 2020-10-24 18:21:13.000000000 +0000 +++ vlc-3.0.20/extras/tools/packages.mak 2023-08-05 10:03:51.000000000 +0000 @@ -57,7 +57,7 @@ HELP2MAN_VERSION=1.47.6 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz -MESON_VERSION=0.55.1 +MESON_VERSION=0.56.2 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz NINJA_VERSION=1.8.2 diff -Nru vlc-3.0.18/include/vlc_aout.h vlc-3.0.20/include/vlc_aout.h --- vlc-3.0.18/include/vlc_aout.h 2018-01-24 07:31:24.000000000 +0000 +++ vlc-3.0.20/include/vlc_aout.h 2023-02-11 09:33:17.000000000 +0000 @@ -129,7 +129,7 @@ /**< Stops the existing stream (optional, may be NULL). * \note A stream must have been started when called. */ - int (*time_get)(audio_output_t *, mtime_t *delay); + int (*time_get)(audio_output_t *, vlc_tick_t *delay); /**< Estimates playback buffer latency (optional, may be NULL). * \param delay pointer to the delay until the next sample to be written * to the playback buffer is rendered [OUT] @@ -140,7 +140,7 @@ /**< Queues a block of samples for playback (mandatory, cannot be NULL). * \note A stream must have been started when called. */ - void (*pause)( audio_output_t *, bool pause, mtime_t date); + void (*pause)( audio_output_t *, bool pause, vlc_tick_t date); /**< Pauses or resumes playback (optional, may be NULL). * \param pause pause if true, resume from pause if false * \param date timestamp when the pause or resume was requested diff -Nru vlc-3.0.18/include/vlc_block.h vlc-3.0.20/include/vlc_block.h --- vlc-3.0.18/include/vlc_block.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_block.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_block.h: Data blocks management functions ***************************************************************************** * Copyright (C) 2003 VLC authors and VideoLAN - * $Id: 1c9478301687233398adbb7de7da4ffc4a101f89 $ + * $Id: c422c50031002ca00180e7a6fbb8a6648c68ea2b $ * * Authors: Laurent Aimar * @@ -49,7 +49,7 @@ * - i_flags may not always be set (ie could be 0, even for a key frame * it depends where you receive the buffer (before/after a packetizer * and the demux/packetizer implementations. - * - i_dts/i_pts could be VLC_TS_INVALID, it means no pts/dts + * - i_dts/i_pts could be VLC_TICK_INVALID, it means no pts/dts * - i_length: length in microseond of the packet, can be null except in the * sout where it is mandatory. * @@ -121,9 +121,9 @@ uint32_t i_flags; unsigned i_nb_samples; /* Used for audio */ - mtime_t i_pts; - mtime_t i_dts; - mtime_t i_length; + vlc_tick_t i_pts; + vlc_tick_t i_dts; + vlc_tick_t i_length; /* Rudimentary support for overloading block (de)allocation. */ block_free_t pf_release; @@ -175,7 +175,7 @@ * * @note * If the block is in a chain, this function does not release any - * subsequent block in the chain. Use block_ChainRelease() for that purpose. + * subsequent block in the chain. Use block_ChainRelease() for that purpose. * * @param block block to release (cannot be NULL) */ @@ -364,10 +364,10 @@ return i_total; } -static inline void block_ChainProperties( block_t *p_list, int *pi_count, size_t *pi_size, mtime_t *pi_length ) +static inline void block_ChainProperties( block_t *p_list, int *pi_count, size_t *pi_size, vlc_tick_t *pi_length ) { size_t i_size = 0; - mtime_t i_length = 0; + vlc_tick_t i_length = 0; int i_count = 0; while( p_list ) @@ -390,7 +390,7 @@ static inline block_t *block_ChainGather( block_t *p_list ) { size_t i_total = 0; - mtime_t i_length = 0; + vlc_tick_t i_length = 0; block_t *g; if( p_list->p_next == NULL ) @@ -534,7 +534,7 @@ * Atomically unlocks the FIFO and waits until one thread signals the FIFO up * to a certain date, then locks the FIFO again. See vlc_fifo_Wait(). */ -int vlc_fifo_TimedWaitCond(vlc_fifo_t *, vlc_cond_t *, mtime_t); +int vlc_fifo_TimedWaitCond(vlc_fifo_t *, vlc_cond_t *, vlc_tick_t); /** * Queues a linked-list of blocks into a locked FIFO. diff -Nru vlc-3.0.18/include/vlc_codec.h vlc-3.0.20/include/vlc_codec.h --- vlc-3.0.18/include/vlc_codec.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_codec.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_codec.h: Definition of the decoder and encoder structures ***************************************************************************** * Copyright (C) 1999-2003 VLC authors and VideoLAN - * $Id: 3499ede27c1dbb94ff665a51d000c55bd45f2794 $ + * $Id: 8fed2f4aca345f7473b8d9e33a55766800ba2420 $ * * Authors: Gildas Bazin * @@ -169,7 +169,7 @@ /* Display date * XXX use decoder_GetDisplayDate */ - mtime_t (*pf_get_display_date)( decoder_t *, mtime_t ); + vlc_tick_t (*pf_get_display_date)( decoder_t *, vlc_tick_t ); /* Display rate * XXX use decoder_GetDisplayRate */ @@ -409,7 +409,7 @@ * to mdate(). * You MUST use it *only* for gathering statistics about speed. */ -VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) VLC_USED; +VLC_API vlc_tick_t decoder_GetDisplayDate( decoder_t *, vlc_tick_t ) VLC_USED; /** * This function returns the current input rate. diff -Nru vlc-3.0.18/include/vlc_common.h vlc-3.0.20/include/vlc_common.h --- vlc-3.0.18/include/vlc_common.h 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/include/vlc_common.h 2023-02-11 09:33:17.000000000 +0000 @@ -152,7 +152,11 @@ * epoch). Note that date and time intervals can be manipulated using regular * arithmetic operators, and that no special functions are required. */ -typedef int64_t mtime_t; +typedef int64_t vlc_tick_t; +typedef vlc_tick_t mtime_t; /* deprecated, use vlc_tick_t */ + +#define VLC_TICK_INVALID VLC_TS_INVALID +#define VLC_TICK_0 VLC_TS_0 /** * The vlc_fourcc_t type. diff -Nru vlc-3.0.18/include/vlc_es_out.h vlc-3.0.20/include/vlc_es_out.h --- vlc-3.0.18/include/vlc_es_out.h 2018-02-19 15:53:40.000000000 +0000 +++ vlc-3.0.20/include/vlc_es_out.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_es_out.h: es_out (demuxer output) descriptor, queries and methods ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN - * $Id: fe53c2a3d34f76eec76d83032cd0d3111be915aa $ + * $Id: 5d7ebcae5bac1b15eeae73cef25fc89702cc8e52 $ * * Authors: Laurent Aimar * @@ -93,8 +93,8 @@ ES_OUT_SET_META, /* arg1=const vlc_meta_t * */ /* PCR system clock manipulation for external clock synchronization */ - ES_OUT_GET_PCR_SYSTEM, /* arg1=mtime_t *, arg2=mtime_t * res=can fail */ - ES_OUT_MODIFY_PCR_SYSTEM, /* arg1=int is_absolute, arg2=mtime_t, res=can fail */ + ES_OUT_GET_PCR_SYSTEM, /* arg1=vlc_tick_t *, arg2=vlc_tick_t * res=can fail */ + ES_OUT_MODIFY_PCR_SYSTEM, /* arg1=int is_absolute, arg2=vlc_tick_t, res=can fail */ ES_OUT_POST_SUBNODE, /* arg1=input_item_node_t *, res=can fail */ @@ -167,11 +167,11 @@ return es_out_Control( out, ES_OUT_SET_META, p_meta ); } -static inline int es_out_ControlGetPcrSystem( es_out_t *out, mtime_t *pi_system, mtime_t *pi_delay ) +static inline int es_out_ControlGetPcrSystem( es_out_t *out, vlc_tick_t *pi_system, vlc_tick_t *pi_delay ) { return es_out_Control( out, ES_OUT_GET_PCR_SYSTEM, pi_system, pi_delay ); } -static inline int es_out_ControlModifyPcrSystem( es_out_t *out, bool b_absolute, mtime_t i_system ) +static inline int es_out_ControlModifyPcrSystem( es_out_t *out, bool b_absolute, vlc_tick_t i_system ) { return es_out_Control( out, ES_OUT_MODIFY_PCR_SYSTEM, b_absolute, i_system ); } diff -Nru vlc-3.0.18/include/vlc_events.h vlc-3.0.20/include/vlc_events.h --- vlc-3.0.18/include/vlc_events.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_events.h 2023-02-11 09:33:17.000000000 +0000 @@ -3,7 +3,7 @@ * Interface used to send events. ***************************************************************************** * Copyright (C) 2007 VLC authors and VideoLAN - * $Id: 229f4f677029763a837558932dad3e47b283e61c $ + * $Id: 4cca73e784d68444833a6c80c33adcd24845155a $ * * Authors: Pierre d'Herbemont * @@ -142,7 +142,7 @@ } input_item_subitem_tree_added; struct vlc_input_item_duration_changed { - mtime_t new_duration; + vlc_tick_t new_duration; } input_item_duration_changed; struct vlc_input_item_preparsed_changed { diff -Nru vlc-3.0.18/include/vlc_filter.h vlc-3.0.20/include/vlc_filter.h --- vlc-3.0.18/include/vlc_filter.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_filter.h 2023-02-11 09:33:17.000000000 +0000 @@ -95,7 +95,7 @@ int, int, int ); /** Generate a subpicture (sub source) */ - subpicture_t *(*pf_sub_source)( filter_t *, mtime_t ); + subpicture_t *(*pf_sub_source)( filter_t *, vlc_tick_t ); /** Filter a subpicture (sub filter) */ subpicture_t *(*pf_sub_filter)( filter_t *, subpicture_t * ); @@ -431,7 +431,7 @@ * \param display_date of subpictures */ void filter_chain_SubSource(filter_chain_t *chain, spu_t *, - mtime_t display_date); + vlc_tick_t display_date); /** * Apply filter chain to subpictures. diff -Nru vlc-3.0.18/include/vlc_fixups.h vlc-3.0.20/include/vlc_fixups.h --- vlc-3.0.18/include/vlc_fixups.h 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/include/vlc_fixups.h 2023-10-30 07:20:48.000000000 +0000 @@ -589,6 +589,12 @@ struct addrinfo *ai_next; }; +# ifdef __LIBCN__ +/* OS/2 LIBCn has inet_pton(). Because of this, socklen_t is not defined above. + * And OS/2 LIBCn has socklen_t. So include sys/socket.h here for socklen_t. */ +# include +# endif + const char *gai_strerror (int); int getaddrinfo (const char *node, const char *service, diff -Nru vlc-3.0.18/include/vlc_input.h vlc-3.0.20/include/vlc_input.h --- vlc-3.0.18/include/vlc_input.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_input.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_input.h: Core input structures ***************************************************************************** * Copyright (C) 1999-2015 VLC authors and VideoLAN - * $Id: d20585ba33030980fa496cd042227b543f10827a $ + * $Id: 0687836b1c287ef7b8c05ff7650bc2a3e1bf3fb8 $ * * Authors: Christophe Massiot * Laurent Aimar @@ -485,8 +485,8 @@ INPUT_SET_RENDERER, /* arg1=vlc_renderer_item_t* */ /* External clock managments */ - INPUT_GET_PCR_SYSTEM, /* arg1=mtime_t *, arg2=mtime_t * res=can fail */ - INPUT_MODIFY_PCR_SYSTEM,/* arg1=int absolute, arg2=mtime_t res=can fail */ + INPUT_GET_PCR_SYSTEM, /* arg1=vlc_tick_t *, arg2=vlc_tick_t * res=can fail */ + INPUT_MODIFY_PCR_SYSTEM,/* arg1=int absolute, arg2=vlc_tick_t res=can fail */ }; /** @}*/ @@ -631,14 +631,14 @@ /** * \see input_clock_GetSystemOrigin */ -static inline int input_GetPcrSystem( input_thread_t *p_input, mtime_t *pi_system, mtime_t *pi_delay ) +static inline int input_GetPcrSystem( input_thread_t *p_input, vlc_tick_t *pi_system, vlc_tick_t *pi_delay ) { return input_Control( p_input, INPUT_GET_PCR_SYSTEM, pi_system, pi_delay ); } /** * \see input_clock_ChangeSystemOrigin */ -static inline int input_ModifyPcrSystem( input_thread_t *p_input, bool b_absolute, mtime_t i_system ) +static inline int input_ModifyPcrSystem( input_thread_t *p_input, bool b_absolute, vlc_tick_t i_system ) { return input_Control( p_input, INPUT_MODIFY_PCR_SYSTEM, b_absolute, i_system ); } diff -Nru vlc-3.0.18/include/vlc_input_item.h vlc-3.0.20/include/vlc_input_item.h --- vlc-3.0.18/include/vlc_input_item.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_input_item.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_input_item.h: Core input item ***************************************************************************** * Copyright (C) 1999-2009 VLC authors and VideoLAN - * $Id: f22c3d9330af98a15992ef08e362424313774d6f $ + * $Id: 62494cbf54c5836aead9ec50d2b2310bec9a1adb $ * * Authors: Christophe Massiot * Laurent Aimar @@ -66,7 +66,7 @@ unsigned optflagc; input_item_opaque_t *opaques; /**< List of opaque pointer values */ - mtime_t i_duration; /**< Duration in microseconds */ + vlc_tick_t i_duration; /**< Duration in microseconds */ int i_categories; /**< Number of info categories */ @@ -265,8 +265,8 @@ VLC_API char * input_item_GetURI( input_item_t * p_i ) VLC_USED; VLC_API char * input_item_GetNowPlayingFb( input_item_t *p_item ) VLC_USED; VLC_API void input_item_SetURI( input_item_t * p_i, const char *psz_uri ); -VLC_API mtime_t input_item_GetDuration( input_item_t * p_i ); -VLC_API void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration ); +VLC_API vlc_tick_t input_item_GetDuration( input_item_t * p_i ); +VLC_API void input_item_SetDuration( input_item_t * p_i, vlc_tick_t i_duration ); VLC_API bool input_item_IsPreparsed( input_item_t *p_i ); VLC_API bool input_item_IsArtFetched( input_item_t *p_i ); @@ -327,7 +327,7 @@ */ VLC_API input_item_t * input_item_NewExt( const char *psz_uri, const char *psz_name, - mtime_t i_duration, int i_type, + vlc_tick_t i_duration, int i_type, enum input_item_net_type i_net ) VLC_USED; #define input_item_New( psz_uri, psz_name ) \ diff -Nru vlc-3.0.18/include/vlc_interrupt.h vlc-3.0.20/include/vlc_interrupt.h --- vlc-3.0.18/include/vlc_interrupt.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_interrupt.h 2023-02-11 09:33:17.000000000 +0000 @@ -71,7 +71,7 @@ * @return EINTR if an interruption occurred, otherwise 0 once the timestamp is * reached. */ -VLC_API int vlc_mwait_i11e(mtime_t); +VLC_API int vlc_mwait_i11e(vlc_tick_t); /** * Interruptible variant of msleep(). @@ -84,7 +84,7 @@ * @return EINTR if an interruption occurred, otherwise 0 once the timeout * expired. */ -static inline int vlc_msleep_i11e(mtime_t delay) +static inline int vlc_msleep_i11e(vlc_tick_t delay) { return vlc_mwait_i11e(mdate() + delay); } diff -Nru vlc-3.0.18/include/vlc_media_library.h vlc-3.0.20/include/vlc_media_library.h --- vlc-3.0.18/include/vlc_media_library.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_media_library.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_media_library.h: SQL-based media library ***************************************************************************** * Copyright (C) 2008-2010 the VideoLAN Team and AUTHORS - * $Id: a35d9729ca3705ec792b7be9e1819919f6e601f6 $ + * $Id: 640c7191582154036750ceed3898da0d4e184764 $ * * Authors: Antoine Lejeune * Jean-Philippe André @@ -116,7 +116,7 @@ typedef enum { ML_TYPE_INT, /**< Object is an int */ ML_TYPE_PSZ, /**< A string char* */ - ML_TYPE_TIME, /**< A timestamp mtime_t */ + ML_TYPE_TIME, /**< A timestamp vlc_tick_t */ ML_TYPE_MEDIA, /**< A pointer to a media ml_media_t* */ } ml_result_type_e; diff -Nru vlc-3.0.18/include/vlc_mtime.h vlc-3.0.20/include/vlc_mtime.h --- vlc-3.0.18/include/vlc_mtime.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_mtime.h 2023-02-11 09:33:17.000000000 +0000 @@ -10,7 +10,7 @@ * Functions prototyped are implemented in interface/mtime.c. ***************************************************************************** * Copyright (C) 1996, 1997, 1998, 1999, 2000 VLC authors and VideoLAN - * $Id: 311eb670eb7b9f35668196b78c9fa3c5cf1779db $ + * $Id: 902e8eba68a813791cf5e77d9b35f6826007d52e $ * * Authors: Vincent Seguin * @@ -40,7 +40,7 @@ * returning the date of the first image to be displayed. It can be used in * comparaison with other values: all existing dates will be earlier. *****************************************************************************/ -#define LAST_MDATE ((mtime_t)((uint64_t)(-1)/2)) +#define LAST_MDATE ((vlc_tick_t)((uint64_t)(-1)/2)) /***************************************************************************** * MSTRTIME_MAX_SIZE: maximum possible size of mstrtime @@ -61,7 +61,7 @@ *****************************************************************************/ struct date_t { - mtime_t date; + vlc_tick_t date; uint32_t i_divider_num; uint32_t i_divider_den; uint32_t i_remainder; @@ -69,10 +69,10 @@ VLC_API void date_Init( date_t *, uint32_t, uint32_t ); VLC_API void date_Change( date_t *, uint32_t, uint32_t ); -VLC_API void date_Set( date_t *, mtime_t ); -VLC_API mtime_t date_Get( const date_t * ); -VLC_API void date_Move( date_t *, mtime_t ); -VLC_API mtime_t date_Increment( date_t *, uint32_t ); -VLC_API mtime_t date_Decrement( date_t *, uint32_t ); +VLC_API void date_Set( date_t *, vlc_tick_t ); +VLC_API vlc_tick_t date_Get( const date_t * ); +VLC_API void date_Move( date_t *, vlc_tick_t ); +VLC_API vlc_tick_t date_Increment( date_t *, uint32_t ); +VLC_API vlc_tick_t date_Decrement( date_t *, uint32_t ); VLC_API uint64_t NTPtime64( void ); #endif /* !__VLC_MTIME_ */ diff -Nru vlc-3.0.18/include/vlc_picture.h vlc-3.0.20/include/vlc_picture.h --- vlc-3.0.18/include/vlc_picture.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_picture.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_picture.h: picture definitions ***************************************************************************** * Copyright (C) 1999 - 2009 VLC authors and VideoLAN - * $Id: 74f156fbbd6e6a4479754c0e79fbd5374a4a1e2e $ + * $Id: 5d849f1fcbf9e0a9c8458e75b9cc373a474555f3 $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -79,7 +79,7 @@ * These properties can be modified using the video output thread API, * but should never be written directly */ /**@{*/ - mtime_t date; /**< display date */ + vlc_tick_t date; /**< display date */ bool b_force; /**@}*/ diff -Nru vlc-3.0.18/include/vlc_picture_fifo.h vlc-3.0.20/include/vlc_picture_fifo.h --- vlc-3.0.18/include/vlc_picture_fifo.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_picture_fifo.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_picture_fifo.h: picture fifo definitions ***************************************************************************** * Copyright (C) 2009 VLC authors and VideoLAN - * $Id: 73d1b20c279f628cf94bc7cfc83b2548878bcc07 $ + * $Id: 2f3a38cb23b0e4f2ac5f40fe5759c8c0e27daace $ * * Authors: Laurent Aimar * @@ -77,12 +77,12 @@ * * All pictures inside the fifo will be released by picture_Release. */ -VLC_API void picture_fifo_Flush( picture_fifo_t *, mtime_t date, bool flush_before ); +VLC_API void picture_fifo_Flush( picture_fifo_t *, vlc_tick_t date, bool flush_before ); /** * It applies a delta on all the picture timestamp. */ -VLC_API void picture_fifo_OffsetDate( picture_fifo_t *, mtime_t delta ); +VLC_API void picture_fifo_OffsetDate( picture_fifo_t *, vlc_tick_t delta ); #endif /* VLC_PICTURE_FIFO_H */ diff -Nru vlc-3.0.18/include/vlc_playlist.h vlc-3.0.20/include/vlc_playlist.h --- vlc-3.0.18/include/vlc_playlist.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_playlist.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_playlist.h : Playlist functions ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN - * $Id: 9498e622cac22fc9c70cb4b298cca02722092d2e $ + * $Id: 322e2713dc4bee19de211e872ee988e84d36eb90 $ * * Authors: Samuel Hocevar * @@ -317,7 +317,7 @@ /** Get the duration of all items in a node. */ -VLC_API mtime_t playlist_GetNodeDuration( playlist_item_t * ); +VLC_API vlc_tick_t playlist_GetNodeDuration( playlist_item_t * ); /** Clear the playlist * \param b_locked TRUE if playlist is locked when entering this function diff -Nru vlc-3.0.18/include/vlc_sout.h vlc-3.0.20/include/vlc_sout.h --- vlc-3.0.18/include/vlc_sout.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_sout.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_sout.h : stream output module ***************************************************************************** * Copyright (C) 2002-2008 VLC authors and VideoLAN - * $Id: c710780e2e15ccd3de5ef3e12a47dcfacfbc744a $ + * $Id: 938315e8ce18dc40319e53bb235aab9b260c70cf $ * * Authors: Christophe Massiot * Laurent Aimar @@ -148,7 +148,7 @@ bool b_add_stream_any_time; bool b_waiting_stream; /* we wait 1.5 second after first stream added */ - mtime_t i_add_stream_start; + vlc_tick_t i_add_stream_start; }; enum sout_mux_query_e @@ -174,7 +174,7 @@ VLC_API void sout_MuxDeleteStream( sout_mux_t *, sout_input_t * ); VLC_API void sout_MuxDelete( sout_mux_t * ); VLC_API int sout_MuxSendBuffer( sout_mux_t *, sout_input_t *, block_t * ); -VLC_API int sout_MuxGetStream(sout_mux_t *, unsigned, mtime_t *); +VLC_API int sout_MuxGetStream(sout_mux_t *, unsigned, vlc_tick_t *); VLC_API void sout_MuxFlush( sout_mux_t *, sout_input_t * ); static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... ) diff -Nru vlc-3.0.18/include/vlc_spu.h vlc-3.0.20/include/vlc_spu.h --- vlc-3.0.18/include/vlc_spu.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/include/vlc_spu.h 2023-02-11 09:33:17.000000000 +0000 @@ -3,7 +3,7 @@ ***************************************************************************** * Copyright (C) 1999-2010 VLC authors and VideoLAN * Copyright (C) 2010 Laurent Aimar - * $Id: 510ee151ec907da9fb6ac88b38cf7ef68a5c4af8 $ + * $Id: cbba59a7a0b376c8710834654714455b9c6bc60b $ * * Authors: Gildas Bazin * Laurent Aimar @@ -57,7 +57,7 @@ /** * This function sends a subpicture to the spu_t core. - * + * * You cannot use the provided subpicture anymore. The spu_t core * will destroy it at its convenience. */ @@ -73,7 +73,7 @@ * * The returned value if non NULL must be released by subpicture_Delete(). */ -VLC_API subpicture_t * spu_Render( spu_t *, const vlc_fourcc_t *p_chroma_list, const video_format_t *p_fmt_dst, const video_format_t *p_fmt_src, mtime_t render_subtitle_date, mtime_t render_osd_date, bool ignore_osd ); +VLC_API subpicture_t * spu_Render( spu_t *, const vlc_fourcc_t *p_chroma_list, const video_format_t *p_fmt_dst, const video_format_t *p_fmt_src, vlc_tick_t render_subtitle_date, vlc_tick_t render_osd_date, bool ignore_osd ); /** * It registers a new SPU channel. diff -Nru vlc-3.0.18/include/vlc_subpicture.h vlc-3.0.20/include/vlc_subpicture.h --- vlc-3.0.18/include/vlc_subpicture.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_subpicture.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_subpicture.h: subpicture definitions ***************************************************************************** * Copyright (C) 1999 - 2009 VLC authors and VideoLAN - * $Id: b9de52c0493687f2f9920753562e2f1eebfd1b7b $ + * $Id: 6fd872d8cde8b15f9499746ae88ee113692b471f $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -127,14 +127,14 @@ int (*pf_validate)( subpicture_t *, bool has_src_changed, const video_format_t *p_fmt_src, bool has_dst_changed, const video_format_t *p_fmt_dst, - mtime_t); + vlc_tick_t); /** Mandatory callback called after pf_validate and doing * the main job of creating the subpicture regions for the * current video_format */ void (*pf_update) ( subpicture_t *, const video_format_t *p_fmt_src, const video_format_t *p_fmt_dst, - mtime_t ); + vlc_tick_t ); /** Optional callback for subpicture private data cleanup */ void (*pf_destroy) ( subpicture_t * ); subpicture_updater_sys_t *p_sys; @@ -168,8 +168,8 @@ /** \name Date properties */ /**@{*/ - mtime_t i_start; /**< beginning of display date */ - mtime_t i_stop; /**< end of display date */ + vlc_tick_t i_start; /**< beginning of display date */ + vlc_tick_t i_stop; /**< end of display date */ bool b_ephemer; /**< If this flag is set to true the subtitle will be displayed until the next one appear */ bool b_fade; /**< enable fading */ @@ -218,7 +218,7 @@ * This function will update the content of a subpicture created with * a non NULL subpicture_updater_t. */ -VLC_API void subpicture_Update( subpicture_t *, const video_format_t *src, const video_format_t *, mtime_t ); +VLC_API void subpicture_Update( subpicture_t *, const video_format_t *src, const video_format_t *, vlc_tick_t ); /** * This function will blend a given subpicture onto a picture. diff -Nru vlc-3.0.18/include/vlc_threads.h vlc-3.0.20/include/vlc_threads.h --- vlc-3.0.18/include/vlc_threads.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_threads.h 2023-02-11 09:33:17.000000000 +0000 @@ -515,7 +515,7 @@ * \return 0 if the condition was signaled, an error code in case of timeout. */ VLC_API int vlc_cond_timedwait(vlc_cond_t *cond, vlc_mutex_t *mutex, - mtime_t deadline); + vlc_tick_t deadline); int vlc_cond_timedwait_daytime(vlc_cond_t *, vlc_mutex_t *, time_t); @@ -648,7 +648,7 @@ * \return true if the function was woken up before the time-out, * false if the time-out elapsed. */ -bool vlc_addr_timedwait(void *addr, unsigned val, mtime_t delay); +bool vlc_addr_timedwait(void *addr, unsigned val, vlc_tick_t delay); /** * Wakes up one thread on an address. @@ -800,7 +800,7 @@ * * \return a timestamp in microseconds. */ -VLC_API mtime_t mdate(void); +VLC_API vlc_tick_t mdate(void); /** * Waits until a deadline. @@ -810,7 +810,7 @@ * \note The deadline may be exceeded due to OS scheduling. * \note This function is a cancellation point. */ -VLC_API void mwait(mtime_t deadline); +VLC_API void mwait(vlc_tick_t deadline); /** * Waits for an interval of time. @@ -820,7 +820,7 @@ * \note The delay may be exceeded due to OS scheduling. * \note This function is a cancellation point. */ -VLC_API void msleep(mtime_t delay); +VLC_API void msleep(vlc_tick_t delay); #define VLC_HARD_MIN_SLEEP 10000 /* 10 milliseconds = 1 tick at 100Hz */ #define VLC_SOFT_MIN_SLEEP 9000000 /* 9 seconds */ @@ -835,7 +835,7 @@ __attribute__((unused)) __attribute__((noinline)) __attribute__((error("sorry, cannot sleep for such short a time"))) -mtime_t impossible_delay( mtime_t delay ) +vlc_tick_t impossible_delay( vlc_tick_t delay ) { (void) delay; return VLC_HARD_MIN_SLEEP; @@ -845,7 +845,7 @@ __attribute__((unused)) __attribute__((noinline)) __attribute__((warning("use proper event handling instead of short delay"))) -mtime_t harmful_delay( mtime_t delay ) +vlc_tick_t harmful_delay( vlc_tick_t delay ) { return delay; } @@ -863,7 +863,7 @@ __attribute__((unused)) __attribute__((noinline)) __attribute__((error("deadlines can not be constant"))) -mtime_t impossible_deadline( mtime_t deadline ) +vlc_tick_t impossible_deadline( vlc_tick_t deadline ) { return deadline; } @@ -925,7 +925,7 @@ * repetition interval. */ VLC_API void vlc_timer_schedule(vlc_timer_t timer, bool absolute, - mtime_t value, mtime_t interval); + vlc_tick_t value, vlc_tick_t interval); /** * Fetches and resets the overrun counter for a timer. diff -Nru vlc-3.0.18/include/vlc_timestamp_helper.h vlc-3.0.20/include/vlc_timestamp_helper.h --- vlc-3.0.18/include/vlc_timestamp_helper.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_timestamp_helper.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_timestamp_helper.h : timestamp handling helpers ***************************************************************************** * Copyright (C) 2014 VLC authors and VideoLAN - * $Id: 90840fbcf7a5197f235ab6160a2cc2708a87c54d $ + * $Id: a13bee1e8448c47e35c45211724b3adceb47fcb0 $ * * Authors: Felix Abecassis * @@ -90,7 +90,7 @@ static inline int64_t timestamp_FifoGet(timestamp_fifo_t *fifo) { if (timestamp_FifoIsEmpty(fifo)) - return VLC_TS_INVALID; + return VLC_TICK_INVALID; int64_t result = fifo->buffer[fifo->begin]; fifo->begin = (fifo->begin + 1) % fifo->capacity; diff -Nru vlc-3.0.18/include/vlc_vout.h vlc-3.0.20/include/vlc_vout.h --- vlc-3.0.18/include/vlc_vout.h 2018-11-13 15:49:00.000000000 +0000 +++ vlc-3.0.20/include/vlc_vout.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_vout.h: common video definitions ***************************************************************************** * Copyright (C) 1999 - 2008 VLC authors and VideoLAN - * $Id: 627f6cec2e3b96eea04f9566ef799ed5b3a93b2a $ + * $Id: a73080b508003e774c123e005bd262e562273d27 $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -143,7 +143,7 @@ VLC_API int vout_GetSnapshot( vout_thread_t *p_vout, block_t **pp_image, picture_t **pp_picture, video_format_t *p_fmt, - const char *psz_format, mtime_t i_timeout ); + const char *psz_format, vlc_tick_t i_timeout ); VLC_API void vout_ChangeAspectRatio( vout_thread_t *p_vout, unsigned int i_num, unsigned int i_den ); diff -Nru vlc-3.0.18/include/vlc_vout_osd.h vlc-3.0.20/include/vlc_vout_osd.h --- vlc-3.0.18/include/vlc_vout_osd.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_vout_osd.h 2023-02-11 09:33:17.000000000 +0000 @@ -3,7 +3,7 @@ ***************************************************************************** * Copyright (C) 1999-2010 VLC authors and VideoLAN * Copyright (C) 2004-2005 M2X - * $Id: a07cd9073156d9ce0d5363543bcc3fd98a6de8f8 $ + * $Id: a97b068f85c0fc320b713515357b41ee62e80077 $ * * Authors: Jean-Paul Saman * Gildas Bazin @@ -63,7 +63,7 @@ * \param duration Duration of the text being displayed * \param text Text to be displayed */ -VLC_API void vout_OSDText( vout_thread_t *vout, int channel, int position, mtime_t duration, const char *text ); +VLC_API void vout_OSDText( vout_thread_t *vout, int channel, int position, vlc_tick_t duration, const char *text ); /** * \brief Write an informative message at the default location, diff -Nru vlc-3.0.18/include/vlc_vout_wrapper.h vlc-3.0.20/include/vlc_vout_wrapper.h --- vlc-3.0.18/include/vlc_vout_wrapper.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/include/vlc_vout_wrapper.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vlc_vout_wrapper.h: definitions for vout wrappers (temporary) ***************************************************************************** * Copyright (C) 2009 Laurent Aimar - * $Id: 7c115473f8500ec32e487006ac68c26424886eaf $ + * $Id: 96b954a0a044640ce2cf73c979e3a2ac60c3e4f0 $ * * Authors: Laurent Aimar * @@ -73,7 +73,7 @@ */ vout_display_t *vout_NewDisplay( vout_thread_t *, const video_format_t *, const vout_display_state_t *, const char *module, - mtime_t double_click_timeout, mtime_t hide_timeout ); + vlc_tick_t double_click_timeout, vlc_tick_t hide_timeout ); /** * It destroy a vout managed display. */ diff -Nru vlc-3.0.18/lib/libvlc_internal.h vlc-3.0.20/lib/libvlc_internal.h --- vlc-3.0.18/lib/libvlc_internal.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/lib/libvlc_internal.h 2023-02-11 09:33:17.000000000 +0000 @@ -3,7 +3,7 @@ * Also contains some internal utility functions ***************************************************************************** * Copyright (C) 2005-2009 VLC authors and VideoLAN - * $Id: d1cc28486cda2cbe750663123eabe6bdc50df02e $ + * $Id: a6ba458d54dba19f6798d99ffc5d5b62ae3bf053 $ * * Authors: Clément Stenac * @@ -99,12 +99,12 @@ libvlc_event_manager_t * p_em, libvlc_event_t * p_event ); -static inline libvlc_time_t from_mtime(mtime_t time) +static inline libvlc_time_t from_mtime(vlc_tick_t time) { return (time + 500ULL)/ 1000ULL; } -static inline mtime_t to_mtime(libvlc_time_t time) +static inline vlc_tick_t to_mtime(libvlc_time_t time) { return time * 1000ULL; } diff -Nru vlc-3.0.18/lib/media_list_path.h vlc-3.0.20/lib/media_list_path.h --- vlc-3.0.18/lib/media_list_path.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/lib/media_list_path.h 2023-09-07 15:23:22.000000000 +0000 @@ -123,8 +123,13 @@ { libvlc_media_t * p_md = libvlc_media_list_item_at_index( p_current_mlist, i ); - if( p_md == p_searched_md ) + if( !p_md ) + return NULL; + + if( p_md == p_searched_md ) { + libvlc_media_release( p_md ); return libvlc_media_list_path_copy_by_appending( path, i ); /* Found! */ + } libvlc_media_list_t * p_subitems = libvlc_media_subitems( p_md ); libvlc_media_release( p_md ); @@ -167,6 +172,9 @@ { libvlc_media_t* p_md = libvlc_media_list_item_at_index( p_current_mlist, path[i] ); + if( !p_md ) + return NULL; + if( p_current_mlist != p_mlist ) libvlc_media_list_release( p_current_mlist ); @@ -208,6 +216,9 @@ libvlc_media_t* p_md = libvlc_media_list_item_at_index( p_current_mlist, path[i] ); + if( !p_md ) + return NULL; + p_current_mlist = libvlc_media_subitems( p_md ); libvlc_media_release( p_md ); diff -Nru vlc-3.0.18/lib/media_list_player.c vlc-3.0.20/lib/media_list_player.c --- vlc-3.0.18/lib/media_list_player.c 2018-03-23 00:22:13.000000000 +0000 +++ vlc-3.0.20/lib/media_list_player.c 2023-09-07 15:23:22.000000000 +0000 @@ -2,7 +2,7 @@ * media_list_player.c: libvlc new API media_list player functions ***************************************************************************** * Copyright (C) 2007-2015 VLC authors and VideoLAN - * $Id: 7f4d427f632098b26be956ec4289d15967ab4f7d $ + * $Id$ * * Authors: Pierre d'Herbemont * Niles Bindel @@ -171,7 +171,11 @@ int depth = libvlc_media_list_path_depth(p_mlp->current_playing_item_path); if (depth < 1 || !p_parent_of_playing_item) + { + if (p_parent_of_playing_item) + libvlc_media_list_release(p_parent_of_playing_item); return NULL; + } ret = libvlc_media_list_path_copy(p_mlp->current_playing_item_path); ret[depth - 1]++; /* set to next element */ @@ -197,6 +201,7 @@ } ret[depth] = -1; ret[depth-1]++; + libvlc_media_list_release(p_parent_of_playing_item); p_parent_of_playing_item = libvlc_media_list_parentlist_at_path( p_mlp->p_mlist, ret); @@ -436,7 +441,7 @@ * * Playlist lock should be held **************************************************************************/ -static void +static int set_current_playing_item(libvlc_media_list_player_t * p_mlp, libvlc_media_list_path_t path) { assert_locked(p_mlp); @@ -449,12 +454,12 @@ } if (!path) - return; + return -1; libvlc_media_t * p_md; p_md = libvlc_media_list_item_at_path(p_mlp->p_mlist, path); if (!p_md) - return; + return -1; /* Make sure media_player_reached_end() won't get called */ uninstall_media_player_observer(p_mlp); @@ -463,6 +468,8 @@ install_media_player_observer(p_mlp); libvlc_media_release(p_md); /* for libvlc_media_list_item_at_index */ + + return 0; } /* @@ -690,8 +697,8 @@ { lock(p_mlp); libvlc_media_list_path_t path = libvlc_media_list_path_with_root_index(i_index); - set_current_playing_item(p_mlp, path); libvlc_media_t *p_md = libvlc_media_player_get_media(p_mlp->p_mi); + int ret = set_current_playing_item(p_mlp, path); libvlc_media_player_play(p_mlp->p_mi); unlock(p_mlp); @@ -704,7 +711,7 @@ event.u.media_list_player_next_item_set.item = p_md; libvlc_event_send(&p_mlp->event_manager, &event); libvlc_media_release(p_md); - return 0; + return ret; } /************************************************************************** @@ -721,10 +728,10 @@ return -1; } - set_current_playing_item(p_mlp, path); + int ret = set_current_playing_item(p_mlp, path); libvlc_media_player_play(p_mlp->p_mi); unlock(p_mlp); - return 0; + return ret; } /************************************************************************** @@ -783,6 +790,7 @@ libvlc_media_list_path_t path = p_mlp->current_playing_item_path; + int ret; if(p_mlp->e_playback_mode != libvlc_playback_mode_repeat) { bool b_loop = (p_mlp->e_playback_mode == libvlc_playback_mode_loop); @@ -790,20 +798,20 @@ while (i_relative_position > 0) { path = get_next_path(p_mlp, b_loop); - set_current_playing_item(p_mlp, path); + ret = set_current_playing_item(p_mlp, path); --i_relative_position; } while (i_relative_position < 0) { path = get_previous_path(p_mlp, b_loop); - set_current_playing_item(p_mlp, path); + ret = set_current_playing_item(p_mlp, path); ++i_relative_position; } } else { - set_current_playing_item(p_mlp, path); + ret = set_current_playing_item(p_mlp, path); } #ifdef DEBUG_MEDIA_LIST_PLAYER @@ -811,7 +819,7 @@ libvlc_media_list_path_dump(path); #endif - if (!path) + if (!path || ret != 0) { libvlc_media_list_unlock(p_mlp->p_mlist); /* Send list played event */ @@ -826,9 +834,12 @@ libvlc_media_list_unlock(p_mlp->p_mlist); /* Send the next item event */ + libvlc_media_t * p_md; + p_md = libvlc_media_list_item_at_path(p_mlp->p_mlist, path); + if (!p_md) + return -1; libvlc_event_t event; event.type = libvlc_MediaListPlayerNextItemSet; - libvlc_media_t * p_md = libvlc_media_list_item_at_path(p_mlp->p_mlist, path); event.u.media_list_player_next_item_set.item = p_md; libvlc_event_send(&p_mlp->event_manager, &event); libvlc_media_release(p_md); diff -Nru vlc-3.0.18/modules/Makefile.in vlc-3.0.20/modules/Makefile.in --- vlc-3.0.18/modules/Makefile.in 2022-10-13 18:40:56.000000000 +0000 +++ vlc-3.0.20/modules/Makefile.in 2023-10-30 07:26:16.000000000 +0000 @@ -200,13 +200,14 @@ @HAVE_TVOS_TRUE@am__append_70 = libaudiounit_ios_plugin.la @ENABLE_SOUT_TRUE@am__append_71 = libedummy_plugin.la @HAVE_DARWIN_TRUE@am__append_72 = -Wl,-framework,CoreFoundation,-framework,CoreServices -@HAVE_MAD_TRUE@am__append_73 = libmad_plugin.la -@ENABLE_SOUT_TRUE@am__append_74 = librtpvideo_plugin.la -@HAVE_XCB_TRUE@am__append_75 = libxwd_plugin.la -@HAVE_WINSTORE_TRUE@am__append_76 = -ldwrite +@HAVE_OSX_TRUE@am__append_73 = -Wl,-framework,AudioUnit +@HAVE_MAD_TRUE@am__append_74 = libmad_plugin.la +@ENABLE_SOUT_TRUE@am__append_75 = librtpvideo_plugin.la +@HAVE_XCB_TRUE@am__append_76 = libxwd_plugin.la +@HAVE_WINSTORE_TRUE@am__append_77 = -ldwrite # dependency: we need grammar build first -@ENABLE_CSS_TRUE@am__append_77 = codec/webvtt/CSSGrammar.h -@ENABLE_CSS_TRUE@am__append_78 = codec/webvtt/CSSGrammar.y \ +@ENABLE_CSS_TRUE@am__append_78 = codec/webvtt/CSSGrammar.h +@ENABLE_CSS_TRUE@am__append_79 = codec/webvtt/CSSGrammar.y \ @ENABLE_CSS_TRUE@ codec/webvtt/CSSLexer.l \ @ENABLE_CSS_TRUE@ codec/webvtt/css_parser.c \ @ENABLE_CSS_TRUE@ codec/webvtt/css_parser.h \ @@ -214,78 +215,80 @@ @ENABLE_CSS_TRUE@ codec/webvtt/css_style.h \ @ENABLE_CSS_TRUE@ codec/webvtt/css_bridge.h -@ENABLE_SOUT_TRUE@am__append_79 = libt140_plugin.la -@ENABLE_SOUT_TRUE@am__append_80 = codec/avcodec/encoder.c -@MERGE_FFMPEG_TRUE@am__append_81 = demux/avformat/demux.c access/avio.c packetizer/avparser.c -@MERGE_FFMPEG_TRUE@am__append_82 = $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) \ +@ENABLE_SOUT_TRUE@am__append_80 = libt140_plugin.la +@HAVE_IOS_TRUE@am__append_81 = -Wl,-framework,UIKit +@HAVE_TVOS_TRUE@am__append_82 = -Wl,-framework,UIKit +@ENABLE_SOUT_TRUE@am__append_83 = codec/avcodec/encoder.c +@MERGE_FFMPEG_TRUE@am__append_84 = demux/avformat/demux.c access/avio.c packetizer/avparser.c +@MERGE_FFMPEG_TRUE@am__append_85 = $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) \ @MERGE_FFMPEG_TRUE@ -DMERGE_FFMPEG -@MERGE_FFMPEG_TRUE@am__append_83 = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) -@ENABLE_SOUT_TRUE@@MERGE_FFMPEG_TRUE@am__append_84 = demux/avformat/mux.c -@HAVE_DARWIN_TRUE@am__append_85 = -Wl,-framework,Foundation -Wl,-framework,Security,-framework,CoreFoundation -@HAVE_AVCODEC_TRUE@am__append_86 = libavcodec_common.la -@HAVE_AVCODEC_TRUE@am__append_87 = libavcodec_plugin.la -@HAVE_AVCODEC_VAAPI_TRUE@@HAVE_VAAPI_DRM_TRUE@am__append_88 = libvaapi_drm_plugin.la -@HAVE_AVCODEC_VAAPI_TRUE@am__append_89 = libvaapi_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_90 = libd3d9_common.la -@HAVE_AVCODEC_DXVA2_TRUE@am__append_91 = libdxva2_plugin.la -@HAVE_WIN32_TRUE@am__append_92 = libd3d11_common.la -@HAVE_WINSTORE_TRUE@am__append_93 = -ld3d11 -@HAVE_AVCODEC_D3D11VA_TRUE@am__append_94 = libd3d11va_plugin.la -@HAVE_ANDROID_TRUE@am__append_95 = video_output/android/utils.c video_output/android/utils.h \ +@MERGE_FFMPEG_TRUE@am__append_86 = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) +@ENABLE_SOUT_TRUE@@MERGE_FFMPEG_TRUE@am__append_87 = demux/avformat/mux.c +@HAVE_DARWIN_TRUE@am__append_88 = -Wl,-framework,Foundation -Wl,-framework,Security,-framework,CoreFoundation +@HAVE_AVCODEC_TRUE@am__append_89 = libavcodec_common.la +@HAVE_AVCODEC_TRUE@am__append_90 = libavcodec_plugin.la +@HAVE_AVCODEC_VAAPI_TRUE@@HAVE_VAAPI_DRM_TRUE@am__append_91 = libvaapi_drm_plugin.la +@HAVE_AVCODEC_VAAPI_TRUE@am__append_92 = libvaapi_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_93 = libd3d9_common.la +@HAVE_AVCODEC_DXVA2_TRUE@am__append_94 = libdxva2_plugin.la +@HAVE_WIN32_TRUE@am__append_95 = libd3d11_common.la +@HAVE_WINSTORE_TRUE@am__append_96 = -ld3d11 +@HAVE_AVCODEC_D3D11VA_TRUE@am__append_97 = libd3d11va_plugin.la +@HAVE_ANDROID_TRUE@am__append_98 = video_output/android/utils.c video_output/android/utils.h \ @HAVE_ANDROID_TRUE@ video_output/android/display.h -@HAVE_ANDROID_TRUE@am__append_96 = libiomx_plugin.la libmediacodec_plugin.la -@HAVE_WIN32_TRUE@am__append_97 = $(LIBCOM) -luuid -@HAVE_WIN32_TRUE@am__append_98 = libdmo_plugin.la libmft_plugin.la -@HAVE_GST_DECODE_TRUE@am__append_99 = libgstdecode_plugin.la -@HAVE_LIRC_TRUE@am__append_100 = liblirc_plugin.la -@HAVE_DARWIN_TRUE@am__append_101 = control/unimotion.c control/unimotion.h -@HAVE_DARWIN_TRUE@am__append_102 = -Wl,-framework,IOKit,-framework,CoreFoundation -@HAVE_WIN32_FALSE@am__append_103 = libmotion_plugin.la -@HAVE_DBUS_TRUE@am__append_104 = libdbus_plugin.la -@HAVE_XCB_KEYSYMS_TRUE@am__append_105 = libxcb_hotkeys_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_106 = libntservice_plugin.la \ +@HAVE_ANDROID_TRUE@am__append_99 = libiomx_plugin.la libmediacodec_plugin.la +@HAVE_WIN32_TRUE@am__append_100 = $(LIBCOM) -luuid +@HAVE_WIN32_TRUE@am__append_101 = libdmo_plugin.la libmft_plugin.la +@HAVE_GST_DECODE_TRUE@am__append_102 = libgstdecode_plugin.la +@HAVE_LIRC_TRUE@am__append_103 = liblirc_plugin.la +@HAVE_DARWIN_TRUE@am__append_104 = control/unimotion.c control/unimotion.h +@HAVE_DARWIN_TRUE@am__append_105 = -Wl,-framework,IOKit,-framework,CoreFoundation +@HAVE_WIN32_FALSE@am__append_106 = libmotion_plugin.la +@HAVE_DBUS_TRUE@am__append_107 = libdbus_plugin.la +@HAVE_XCB_KEYSYMS_TRUE@am__append_108 = libxcb_hotkeys_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_109 = libntservice_plugin.la \ @HAVE_WIN32_DESKTOP_TRUE@ libwin_hotkeys_plugin.la \ @HAVE_WIN32_DESKTOP_TRUE@ libwin_msg_plugin.la -@ENABLE_SOUT_TRUE@am__append_107 = demux/avformat/mux.c -@HAVE_ZLIB_TRUE@am__append_108 = -lz -@HAVE_DARWIN_TRUE@am__append_109 = -Wl,-read_only_relocs,suppress -@HAVE_AVFORMAT_TRUE@@MERGE_FFMPEG_FALSE@am__append_110 = libavformat_plugin.la -@HAVE_AVFORMAT_TRUE@@MERGE_FFMPEG_FALSE@am__append_111 = libavcodec_common.la -@HAVE_ZLIB_TRUE@am__append_112 = -lz -@HAVE_ZLIB_TRUE@am__append_113 = -lz -@HAVE_ARIBB24_TRUE@am__append_114 = $(ARIBB24_CFLAGS) -@HAVE_ARIBB24_TRUE@am__append_115 = $(ARIBB24_LIBS) -@HAVE_DVBPSI_TRUE@am__append_116 = libts_plugin.la -@HAVE_WIN32_FALSE@am__append_117 = -lpthread -@HAVE_ZLIB_TRUE@am__append_118 = -lz -@HAVE_GCRYPT_TRUE@am__append_119 = $(GCRYPT_CFLAGS) -@HAVE_GCRYPT_TRUE@am__append_120 = $(GCRYPT_LIBS) -@HAVE_NCURSES_TRUE@am__append_121 = libncurses_plugin.la -@HAVE_SPARKLE_TRUE@am__append_122 = -Wl,-framework,Sparkle -@ENABLE_MACOSX_UI_TRUE@am__append_123 = libmacosx_plugin.la -@ENABLE_MACOSX_UI_TRUE@am__append_124 = $(nodist_libmacosx_plugin_la_SOURCES) -@HAVE_DARWIN_TRUE@am__append_125 = -Wl,-framework,Cocoa -@HAVE_QT5_X11_TRUE@am__append_126 = $(QT5_X11_CFLAGS) -DQT5_HAS_X11 -@HAVE_QT5_X11_TRUE@am__append_127 = $(QT5_X11_LIBS) $(X_LIBS) $(X_PRE_LIB) -lX11 -@HAVE_XCB_TRUE@am__append_128 = -DQT5_HAS_XCB -@HAVE_WAYLAND_TRUE@am__append_129 = -DQT5_HAS_WAYLAND \ +@ENABLE_SOUT_TRUE@am__append_110 = demux/avformat/mux.c +@HAVE_ZLIB_TRUE@am__append_111 = -lz +@HAVE_DARWIN_TRUE@am__append_112 = -Wl,-read_only_relocs,suppress +@HAVE_AVFORMAT_TRUE@@MERGE_FFMPEG_FALSE@am__append_113 = libavformat_plugin.la +@HAVE_AVFORMAT_TRUE@@MERGE_FFMPEG_FALSE@am__append_114 = libavcodec_common.la +@HAVE_ZLIB_TRUE@am__append_115 = -lz +@HAVE_ZLIB_TRUE@am__append_116 = -lz +@HAVE_ARIBB24_TRUE@am__append_117 = $(ARIBB24_CFLAGS) +@HAVE_ARIBB24_TRUE@am__append_118 = $(ARIBB24_LIBS) +@HAVE_DVBPSI_TRUE@am__append_119 = libts_plugin.la +@HAVE_WIN32_FALSE@am__append_120 = -lpthread +@HAVE_ZLIB_TRUE@am__append_121 = -lz +@HAVE_GCRYPT_TRUE@am__append_122 = $(GCRYPT_CFLAGS) +@HAVE_GCRYPT_TRUE@am__append_123 = $(GCRYPT_LIBS) +@HAVE_NCURSES_TRUE@am__append_124 = libncurses_plugin.la +@HAVE_SPARKLE_TRUE@am__append_125 = -Wl,-framework,Sparkle +@ENABLE_MACOSX_UI_TRUE@am__append_126 = libmacosx_plugin.la +@ENABLE_MACOSX_UI_TRUE@am__append_127 = $(nodist_libmacosx_plugin_la_SOURCES) +@HAVE_DARWIN_TRUE@am__append_128 = -Wl,-framework,Cocoa +@HAVE_QT5_X11_TRUE@am__append_129 = $(QT5_X11_CFLAGS) -DQT5_HAS_X11 +@HAVE_QT5_X11_TRUE@am__append_130 = $(QT5_X11_LIBS) $(X_LIBS) $(X_PRE_LIB) -lX11 +@HAVE_XCB_TRUE@am__append_131 = -DQT5_HAS_XCB +@HAVE_WAYLAND_TRUE@am__append_132 = -DQT5_HAS_WAYLAND \ @HAVE_WAYLAND_TRUE@ -DQPNI_HEADER=\<$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h\> -@HAVE_WAYLAND_TRUE@am__append_130 = $(WAYLAND_CLIENT_CFLAGS) -@HAVE_WAYLAND_TRUE@am__append_131 = $(WAYLAND_CLIENT_LIBS) -@HAVE_WIN32_TRUE@am__append_132 = $(LIBCOM) -lcomctl32 -luuid -@UPDATE_CHECK_TRUE@am__append_133 = -DUPDATE_CHECK -@HAVE_WIN32_TRUE@am__append_134 = \ +@HAVE_WAYLAND_TRUE@am__append_133 = $(WAYLAND_CLIENT_CFLAGS) +@HAVE_WAYLAND_TRUE@am__append_134 = $(WAYLAND_CLIENT_LIBS) +@HAVE_WIN32_TRUE@am__append_135 = $(LIBCOM) -lcomctl32 -luuid +@UPDATE_CHECK_TRUE@am__append_136 = -DUPDATE_CHECK +@HAVE_WIN32_TRUE@am__append_137 = \ @HAVE_WIN32_TRUE@ gui/qt/main_interface_win32.cpp gui/qt/main_interface_win32.hpp -@HAVE_WIN32_TRUE@am__append_135 = gui/qt/main_interface_win32.moc.cpp -@HAVE_DARWIN_TRUE@am__append_136 = -DQ_OS_MAC -@HAVE_WIN32_TRUE@am__append_137 = -D_WIN32 -@ENABLE_VLM_TRUE@am__append_138 = gui/qt/dialogs/vlm.moc.cpp -@ENABLE_QT_TRUE@am__append_139 = libqt_plugin.la -@ENABLE_QT_TRUE@am__append_140 = $(nodist_libqt_plugin_la_SOURCES) -@HAVE_WIN32_TRUE@am__append_141 = \ +@HAVE_WIN32_TRUE@am__append_138 = gui/qt/main_interface_win32.moc.cpp +@HAVE_DARWIN_TRUE@am__append_139 = -DQ_OS_MAC +@HAVE_WIN32_TRUE@am__append_140 = -D_WIN32 +@ENABLE_VLM_TRUE@am__append_141 = gui/qt/dialogs/vlm.moc.cpp +@ENABLE_QT_TRUE@am__append_142 = libqt_plugin.la +@ENABLE_QT_TRUE@am__append_143 = $(nodist_libqt_plugin_la_SOURCES) +@HAVE_WIN32_TRUE@am__append_144 = \ @HAVE_WIN32_TRUE@ gui/skins2/win32/win32_dragdrop.cpp \ @HAVE_WIN32_TRUE@ gui/skins2/win32/win32_dragdrop.hpp \ @HAVE_WIN32_TRUE@ gui/skins2/win32/win32_factory.cpp \ @@ -304,7 +307,7 @@ @HAVE_WIN32_TRUE@ gui/skins2/win32/win32_window.hpp \ @HAVE_WIN32_TRUE@ $(NULL) -@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@am__append_142 = \ +@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@am__append_145 = \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/os2_dragdrop.cpp \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/os2_dragdrop.hpp \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/os2_factory.cpp \ @@ -323,7 +326,7 @@ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/os2_window.hpp \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ $(NULL) -@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@am__append_143 = \ +@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@am__append_146 = \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/x11_display.cpp \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/x11_display.hpp \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/x11_dragdrop.cpp \ @@ -344,164 +347,163 @@ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/x11_tooltip.hpp \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ $(NULL) -@BUILD_SKINS_TRUE@am__append_144 = libskins2_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_145 = libdirect3d9_filters_plugin.la -@HAVE_WINSTORE_TRUE@am__append_146 = -ld3d11 -@HAVE_VDPAU_TRUE@am__append_147 = libvlc_vdpau.la -@HAVE_VDPAU_TRUE@@HAVE_XCB_TRUE@am__append_148 = libvdpau_display_plugin.la -@HAVE_AVCODEC_VDPAU_TRUE@@HAVE_VDPAU_TRUE@am__append_149 = libvdpau_avcodec_plugin.la -@HAVE_ANDROID_TRUE@am__append_150 = keystore/file_crypt_android.c -@HAVE_WIN32_TRUE@am__append_151 = keystore/file_crypt_win32.c -@HAVE_OSX_TRUE@am__append_152 = libkeychain_plugin.la -@HAVE_SYSLOG_TRUE@am__append_153 = libsyslog_plugin.la -@HAVE_SYSTEMD_TRUE@am__append_154 = libsd_journal_plugin.la -@HAVE_ANDROID_TRUE@am__append_155 = libandroid_logger_plugin.la -@HAVE_WIN32_TRUE@am__append_156 = lua/libs/win.c -@HAVE_WIN32_TRUE@am__append_157 = $(SOCKET_LIBS) -@HAVE_DARWIN_TRUE@am__append_158 = -Wl,-framework,Security,-framework,CoreFoundation -@HAVE_DARWIN_TRUE@am__append_159 = libsecuretransport_plugin.la -@HAVE_XCB_TRUE@am__append_160 = libxdg_screensaver_plugin.la -@HAVE_DBUS_TRUE@am__append_161 = libdbus_screensaver_plugin.la -@ENABLE_ADDONMANAGERMODULES_TRUE@am__append_162 = \ +@BUILD_SKINS_TRUE@am__append_147 = libskins2_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_148 = libdirect3d9_filters_plugin.la +@HAVE_WINSTORE_TRUE@am__append_149 = -ld3d11 +@HAVE_VDPAU_TRUE@am__append_150 = libvlc_vdpau.la +@HAVE_VDPAU_TRUE@@HAVE_XCB_TRUE@am__append_151 = libvdpau_display_plugin.la +@HAVE_AVCODEC_VDPAU_TRUE@@HAVE_VDPAU_TRUE@am__append_152 = libvdpau_avcodec_plugin.la +@HAVE_ANDROID_TRUE@am__append_153 = keystore/file_crypt_android.c +@HAVE_WIN32_TRUE@am__append_154 = keystore/file_crypt_win32.c +@HAVE_OSX_TRUE@am__append_155 = libkeychain_plugin.la +@HAVE_SYSLOG_TRUE@am__append_156 = libsyslog_plugin.la +@HAVE_SYSTEMD_TRUE@am__append_157 = libsd_journal_plugin.la +@HAVE_ANDROID_TRUE@am__append_158 = libandroid_logger_plugin.la +@HAVE_WIN32_TRUE@am__append_159 = lua/libs/win.c +@HAVE_WIN32_TRUE@am__append_160 = $(SOCKET_LIBS) +@HAVE_DARWIN_TRUE@am__append_161 = -Wl,-framework,Security,-framework,CoreFoundation +@HAVE_DARWIN_TRUE@am__append_162 = libsecuretransport_plugin.la +@HAVE_XCB_TRUE@am__append_163 = libxdg_screensaver_plugin.la +@HAVE_DBUS_TRUE@am__append_164 = libdbus_screensaver_plugin.la +@ENABLE_ADDONMANAGERMODULES_TRUE@am__append_165 = \ @ENABLE_ADDONMANAGERMODULES_TRUE@ libaddonsvorepository_plugin.la \ @ENABLE_ADDONMANAGERMODULES_TRUE@ libaddonsfsstorage_plugin.la -@ENABLE_SOUT_TRUE@am__append_163 = libvod_rtsp_plugin.la -@HAVE_AVCODEC_TRUE@@MERGE_FFMPEG_FALSE@am__append_164 = libpacketizer_avparser_plugin.la -@HAVE_OSX_TRUE@am__append_165 = -Wl,-framework,CoreFoundation,-framework,SystemConfiguration -@HAVE_PULSE_TRUE@am__append_166 = libpulselist_plugin.la -@HAVE_ALSA_TRUE@am__append_167 = $(ALSA_CFLAGS) -DHAVE_ALSA -@HAVE_ALSA_TRUE@am__append_168 = $(ALSA_LIBS) -@HAVE_XCB_TRUE@am__append_169 = libxcb_apps_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_170 = libwindrive_plugin.la -@HAVE_OS2_TRUE@am__append_171 = libos2drive_plugin.la -@HAVE_WIN32_TRUE@am__append_172 = -liphlpapi -@HAVE_DARWIN_TRUE@am__append_173 = libbonjour_plugin.la -@HAVE_WIN32_FALSE@am__append_174 = libdynamicoverlay_plugin.la -@HAVE_GCRYPT_TRUE@am__append_175 = libremoteosd_plugin.la -@HAVE_TVOS_FALSE@@HAVE_WIN32_FALSE@am__append_176 = libdecomp_plugin.la -@HAVE_ZLIB_TRUE@am__append_177 = libinflate_plugin.la -@HAVE_WINSTORE_FALSE@am__append_178 = libprefetch_plugin.la -@HAVE_WIN32_TRUE@am__append_179 = text_renderer/freetype/fonts/dwrite.cpp -@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_180 = text_renderer/freetype/fonts/win32.c -@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_181 = -liconv -lz -lusp10 -lgdi32 -luuid -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_WIN32_TRUE@am__append_182 = -ldwrite -luuid -@HAVE_FONTCONFIG_TRUE@am__append_183 = text_renderer/freetype/fonts/fontconfig.c -@HAVE_FONTCONFIG_TRUE@am__append_184 = -DHAVE_FONTCONFIG -@HAVE_FONTCONFIG_TRUE@am__append_185 = $(FONTCONFIG_LIBS) -@HAVE_ANDROID_TRUE@am__append_186 = text_renderer/freetype/fonts/android.c -@HAVE_DARWIN_TRUE@am__append_187 = text_renderer/freetype/fonts/darwin.c -@HAVE_DARWIN_TRUE@am__append_188 = -Wl,-framework,CoreFoundation -Wl,-framework,CoreText -@HAVE_FRIBIDI_TRUE@am__append_189 = $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI -@HAVE_FRIBIDI_TRUE@am__append_190 = $(FRIBIDI_LIBS) -@HAVE_HARFBUZZ_TRUE@am__append_191 = $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ -@HAVE_HARFBUZZ_TRUE@am__append_192 = $(HARFBUZZ_LIBS) -@HAVE_FREETYPE_TRUE@am__append_193 = libfreetype_plugin.la -@HAVE_OSX_TRUE@am__append_194 = libnsspeechsynthesizer_plugin.la -@HAVE_SAPI_TRUE@am__append_195 = libsapi_plugin.la -@HAVE_ALTIVEC_TRUE@am__append_196 = \ +@ENABLE_SOUT_TRUE@am__append_166 = libvod_rtsp_plugin.la +@HAVE_AVCODEC_TRUE@@MERGE_FFMPEG_FALSE@am__append_167 = libpacketizer_avparser_plugin.la +@HAVE_OSX_TRUE@am__append_168 = -Wl,-framework,CoreFoundation,-framework,SystemConfiguration +@HAVE_PULSE_TRUE@am__append_169 = libpulselist_plugin.la +@HAVE_ALSA_TRUE@am__append_170 = $(ALSA_CFLAGS) -DHAVE_ALSA +@HAVE_ALSA_TRUE@am__append_171 = $(ALSA_LIBS) +@HAVE_XCB_TRUE@am__append_172 = libxcb_apps_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_173 = libwindrive_plugin.la +@HAVE_OS2_TRUE@am__append_174 = libos2drive_plugin.la +@HAVE_WIN32_TRUE@am__append_175 = -liphlpapi +@HAVE_DARWIN_TRUE@am__append_176 = libbonjour_plugin.la +@HAVE_WIN32_FALSE@am__append_177 = libdynamicoverlay_plugin.la +@HAVE_GCRYPT_TRUE@am__append_178 = libremoteosd_plugin.la +@HAVE_TVOS_FALSE@@HAVE_WIN32_FALSE@am__append_179 = libdecomp_plugin.la +@HAVE_ZLIB_TRUE@am__append_180 = libinflate_plugin.la +@HAVE_WINSTORE_FALSE@am__append_181 = libprefetch_plugin.la +@HAVE_WIN32_TRUE@am__append_182 = text_renderer/freetype/fonts/dwrite.cpp +@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_183 = text_renderer/freetype/fonts/win32.c +@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_184 = -liconv -lz -lusp10 -lgdi32 -luuid +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_WIN32_TRUE@am__append_185 = -ldwrite -luuid +@HAVE_FONTCONFIG_TRUE@am__append_186 = text_renderer/freetype/fonts/fontconfig.c +@HAVE_FONTCONFIG_TRUE@am__append_187 = -DHAVE_FONTCONFIG +@HAVE_FONTCONFIG_TRUE@am__append_188 = $(FONTCONFIG_LIBS) +@HAVE_ANDROID_TRUE@am__append_189 = text_renderer/freetype/fonts/android.c +@HAVE_DARWIN_TRUE@am__append_190 = text_renderer/freetype/fonts/darwin.c +@HAVE_DARWIN_TRUE@am__append_191 = -Wl,-framework,CoreFoundation -Wl,-framework,CoreText +@HAVE_FRIBIDI_TRUE@am__append_192 = $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI +@HAVE_FRIBIDI_TRUE@am__append_193 = $(FRIBIDI_LIBS) +@HAVE_HARFBUZZ_TRUE@am__append_194 = $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ +@HAVE_HARFBUZZ_TRUE@am__append_195 = $(HARFBUZZ_LIBS) +@HAVE_FREETYPE_TRUE@am__append_196 = libfreetype_plugin.la +@HAVE_OSX_TRUE@am__append_197 = libnsspeechsynthesizer_plugin.la +@HAVE_SAPI_TRUE@am__append_198 = libsapi_plugin.la +@HAVE_ALTIVEC_TRUE@am__append_199 = \ @HAVE_ALTIVEC_TRUE@ libi420_yuy2_altivec_plugin.la -@HAVE_MMX_TRUE@am__append_197 = \ +@HAVE_MMX_TRUE@am__append_200 = \ @HAVE_MMX_TRUE@ libi420_rgb_mmx_plugin.la \ @HAVE_MMX_TRUE@ libi420_yuy2_mmx_plugin.la \ @HAVE_MMX_TRUE@ libi422_yuy2_mmx_plugin.la -@HAVE_SSE2_TRUE@am__append_198 = \ +@HAVE_SSE2_TRUE@am__append_201 = \ @HAVE_SSE2_TRUE@ libi420_rgb_sse2_plugin.la \ @HAVE_SSE2_TRUE@ libi420_yuy2_sse2_plugin.la \ @HAVE_SSE2_TRUE@ libi422_yuy2_sse2_plugin.la -@HAVE_SSE2_TRUE@am__append_199 = chroma_copy_sse_test -@HAVE_SSE2_TRUE@am__append_200 = chroma_copy_sse_test -@HAVE_DARWIN_TRUE@am__append_201 = -Wl,-framework,IOKit,-framework,CoreFoundation -@HAVE_OSX_TRUE@am__append_202 = libci_filters_plugin.la -@HAVE_IOS_TRUE@am__append_203 = libci_filters_plugin.la -@HAVE_NEON_TRUE@am__append_204 = video_filter/deinterlace/merge_arm.S -@HAVE_NEON_TRUE@am__append_205 = -DCAN_COMPILE_ARM -@HAVE_ARM64_TRUE@am__append_206 = video_filter/deinterlace/merge_arm64.S -@HAVE_ARM64_TRUE@am__append_207 = -DCAN_COMPILE_ARM64 -@HAVE_ALTIVEC_TRUE@am__append_208 = -DCAN_COMPILE_C_ALTIVEC -@HAVE_WIN32_DESKTOP_TRUE@am__append_209 = libpanoramix_plugin.la -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_210 = $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS) -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_211 = $(XCB_RANDR_LIBS) $(XCB_LIBS) -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_212 = libpanoramix_plugin.la -@HAVE_DECKLINK_TRUE@am__append_213 = libdecklinkoutput_plugin.la -@HAVE_OSX_TRUE@am__append_214 = codec/vt_utils.c codec/vt_utils.h -@HAVE_OSX_TRUE@am__append_215 = -Wl,-framework,IOSurface \ -@HAVE_OSX_TRUE@ -Wl,-framework,Foundation,-framework,CoreVideo,-framework,OpenGL - -@HAVE_OSX_TRUE@am__append_216 = libvout_macosx_plugin.la libcaopengllayer_plugin.la \ +@HAVE_SSE2_TRUE@am__append_202 = chroma_copy_sse_test +@HAVE_SSE2_TRUE@am__append_203 = chroma_copy_sse_test +@HAVE_DARWIN_TRUE@am__append_204 = -Wl,-framework,IOKit,-framework,CoreFoundation +@HAVE_OSX_TRUE@am__append_205 = libci_filters_plugin.la +@HAVE_IOS_TRUE@am__append_206 = libci_filters_plugin.la +@HAVE_NEON_TRUE@am__append_207 = video_filter/deinterlace/merge_arm.S +@HAVE_NEON_TRUE@am__append_208 = -DCAN_COMPILE_ARM +@HAVE_ARM64_TRUE@am__append_209 = video_filter/deinterlace/merge_arm64.S +@HAVE_ARM64_TRUE@am__append_210 = -DCAN_COMPILE_ARM64 +@HAVE_ALTIVEC_TRUE@am__append_211 = -DCAN_COMPILE_C_ALTIVEC +@HAVE_WIN32_DESKTOP_TRUE@am__append_212 = libpanoramix_plugin.la +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_213 = $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS) +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_214 = $(XCB_RANDR_LIBS) $(XCB_LIBS) +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_215 = libpanoramix_plugin.la +@HAVE_DECKLINK_TRUE@am__append_216 = libdecklinkoutput_plugin.la +@HAVE_OSX_TRUE@am__append_217 = libvout_macosx_plugin.la libcaopengllayer_plugin.la \ @HAVE_OSX_TRUE@ libglconv_cvpx_plugin.la -@HAVE_IOS_TRUE@am__append_217 = libvout_ios_plugin.la libglconv_cvpx_plugin.la -@HAVE_TVOS_TRUE@am__append_218 = libvout_ios_plugin.la libglconv_cvpx_plugin.la -@HAVE_WIN32_TRUE@am__append_219 = -DHAVE_GL_CORE_SYMBOLS -@HAVE_WIN32_TRUE@am__append_220 = $(GL_LIBS) -@HAVE_GL_TRUE@am__append_221 = libgl_plugin.la -@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_WL_TRUE@@HAVE_WAYLAND_EGL_TRUE@am__append_222 = libglconv_vaapi_wl_plugin.la -@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_X11_TRUE@@HAVE_XCB_TRUE@am__append_223 = libglconv_vaapi_x11_plugin.la -@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_DRM_TRUE@@HAVE_VAAPI_TRUE@am__append_224 = libglconv_vaapi_drm_plugin.la -@HAVE_GL_TRUE@@HAVE_VDPAU_TRUE@am__append_225 = libglconv_vdpau_plugin.la -@HAVE_XCB_TRUE@am__append_226 = libvlc_xcb_events.la -@HAVE_XCB_TRUE@am__append_227 = libxcb_x11_plugin.la libxcb_window_plugin.la -@HAVE_XCB_KEYSYMS_TRUE@@HAVE_XCB_TRUE@am__append_228 = -DHAVE_XCB_KEYSYMS -@HAVE_XCB_TRUE@@HAVE_XCB_XVIDEO_TRUE@am__append_229 = libxcb_xv_plugin.la -@HAVE_EGL_TRUE@@HAVE_XCB_TRUE@am__append_230 = libegl_x11_plugin.la -@HAVE_GL_TRUE@@HAVE_XCB_TRUE@am__append_231 = libglx_plugin.la -@HAVE_WAYLAND_TRUE@am__append_232 = \ +@HAVE_OSX_TRUE@am__append_218 = -Wl,-framework,OpenGL +@HAVE_OSX_FALSE@am__append_219 = -Wl,-framework,OpenGLES +@HAVE_IOS_TRUE@am__append_220 = libvout_ios_plugin.la libglconv_cvpx_plugin.la +@HAVE_TVOS_TRUE@am__append_221 = libvout_ios_plugin.la libglconv_cvpx_plugin.la +@HAVE_WIN32_TRUE@am__append_222 = -DHAVE_GL_CORE_SYMBOLS +@HAVE_WIN32_TRUE@am__append_223 = $(GL_LIBS) +@HAVE_GL_TRUE@am__append_224 = libgl_plugin.la +@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_WL_TRUE@@HAVE_WAYLAND_EGL_TRUE@am__append_225 = libglconv_vaapi_wl_plugin.la +@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_X11_TRUE@@HAVE_XCB_TRUE@am__append_226 = libglconv_vaapi_x11_plugin.la +@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_DRM_TRUE@@HAVE_VAAPI_TRUE@am__append_227 = libglconv_vaapi_drm_plugin.la +@HAVE_GL_TRUE@@HAVE_VDPAU_TRUE@am__append_228 = libglconv_vdpau_plugin.la +@HAVE_XCB_TRUE@am__append_229 = libvlc_xcb_events.la +@HAVE_XCB_TRUE@am__append_230 = libxcb_x11_plugin.la libxcb_window_plugin.la +@HAVE_XCB_KEYSYMS_TRUE@@HAVE_XCB_TRUE@am__append_231 = -DHAVE_XCB_KEYSYMS +@HAVE_XCB_TRUE@@HAVE_XCB_XVIDEO_TRUE@am__append_232 = libxcb_xv_plugin.la +@HAVE_EGL_TRUE@@HAVE_XCB_TRUE@am__append_233 = libegl_x11_plugin.la +@HAVE_GL_TRUE@@HAVE_XCB_TRUE@am__append_234 = libglx_plugin.la +@HAVE_WAYLAND_TRUE@am__append_235 = \ @HAVE_WAYLAND_TRUE@ $(nodist_libwl_shm_plugin_la_SOURCES) \ @HAVE_WAYLAND_TRUE@ $(nodist_libxdg_shell_plugin_la_SOURCES) -@HAVE_WAYLAND_TRUE@am__append_233 = libwl_shm_plugin.la \ +@HAVE_WAYLAND_TRUE@am__append_236 = libwl_shm_plugin.la \ @HAVE_WAYLAND_TRUE@ libwl_shell_plugin.la \ @HAVE_WAYLAND_TRUE@ libxdg_shell_plugin.la -@HAVE_EGL_TRUE@@HAVE_WAYLAND_EGL_TRUE@@HAVE_WAYLAND_TRUE@am__append_234 = libegl_wl_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_235 = $(LTLIBdirect3d9) -@HAVE_WIN32_DESKTOP_TRUE@am__append_236 = libdirect3d9_plugin.la -@HAVE_WINSTORE_FALSE@am__append_237 = video_output/win32/events.c \ +@HAVE_EGL_TRUE@@HAVE_WAYLAND_EGL_TRUE@@HAVE_WAYLAND_TRUE@am__append_237 = libegl_wl_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_238 = $(LTLIBdirect3d9) +@HAVE_WIN32_DESKTOP_TRUE@am__append_239 = libdirect3d9_plugin.la +@HAVE_GL_TRUE@@HAVE_WIN32_DESKTOP_TRUE@am__append_240 = libglinterop_dxva2_plugin.la +@HAVE_WINSTORE_FALSE@am__append_241 = video_output/win32/events.c \ @HAVE_WINSTORE_FALSE@ video_output/win32/events.h \ @HAVE_WINSTORE_FALSE@ video_output/win32/sensors.cpp \ @HAVE_WINSTORE_FALSE@ video_output/win32/win32touch.c video_output/win32/win32touch.h -@HAVE_WINSTORE_FALSE@am__append_238 = -lgdi32 -@HAVE_WINSTORE_TRUE@am__append_239 = -ld3d11 -ld3dcompiler_47 -@HAVE_WIN32_DESKTOP_TRUE@am__append_240 = $(LTLIBdirectdraw) \ +@HAVE_WINSTORE_FALSE@am__append_242 = -lgdi32 +@HAVE_WINSTORE_TRUE@am__append_243 = -ld3d11 -ld3dcompiler_47 +@HAVE_WIN32_DESKTOP_TRUE@am__append_244 = $(LTLIBdirectdraw) \ @HAVE_WIN32_DESKTOP_TRUE@ $(LTLIBglwin32) $(LTLIBwgl) \ @HAVE_WIN32_DESKTOP_TRUE@ libwingdi_plugin.la \ @HAVE_WIN32_DESKTOP_TRUE@ libwinhibit_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_241 = libdirectdraw_plugin.la \ +@HAVE_WIN32_DESKTOP_TRUE@am__append_245 = libdirectdraw_plugin.la \ @HAVE_WIN32_DESKTOP_TRUE@ libglwin32_plugin.la libwgl_plugin.la -@HAVE_EGL_TRUE@@HAVE_WIN32_TRUE@am__append_242 = libegl_win32_plugin.la -@HAVE_WIN32_TRUE@am__append_243 = libdrawable_plugin.la +@HAVE_EGL_TRUE@@HAVE_WIN32_TRUE@am__append_246 = libegl_win32_plugin.la +@HAVE_WIN32_TRUE@am__append_247 = libdrawable_plugin.la ### OS/2 ### -@HAVE_OS2_TRUE@am__append_244 = libdrawable_plugin.la -@HAVE_KVA_TRUE@am__append_245 = libkva_plugin.la -@HAVE_ANDROID_TRUE@am__append_246 = libandroid_window_plugin.la libandroid_display_plugin.la -@HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@am__append_247 = libegl_android_plugin.la libglconv_android_plugin.la -@HAVE_WIN32_FALSE@am__append_248 = $(X_LIBS) $(X_PRE_LIBS) -lX11 -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_249 = $(X_LIBS) $(X_PRE_LIBS) -lX11 -@HAVE_EVAS_TRUE@am__append_250 = libevas_plugin.la -@HAVE_GL_TRUE@am__append_251 = libglspectrum_plugin.la -@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_252 = libaccess_output_livehttp_plugin.la -@ENABLE_SOUT_TRUE@am__append_253 = libaccess_output_shout_plugin.la \ +@HAVE_OS2_TRUE@am__append_248 = libdrawable_plugin.la +@HAVE_KVA_TRUE@am__append_249 = libkva_plugin.la +@HAVE_ANDROID_TRUE@am__append_250 = libandroid_window_plugin.la libandroid_display_plugin.la +@HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@am__append_251 = libegl_android_plugin.la libglconv_android_plugin.la +@HAVE_WIN32_FALSE@am__append_252 = $(X_LIBS) $(X_PRE_LIBS) -lX11 +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_253 = $(X_LIBS) $(X_PRE_LIBS) -lX11 +@HAVE_EVAS_TRUE@am__append_254 = libevas_plugin.la +@HAVE_GL_TRUE@am__append_255 = libglspectrum_plugin.la +@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_256 = libaccess_output_livehttp_plugin.la +@ENABLE_SOUT_TRUE@am__append_257 = libaccess_output_shout_plugin.la \ @ENABLE_SOUT_TRUE@ libaccess_output_srt_plugin.la \ @ENABLE_SOUT_TRUE@ libmux_ogg_plugin.la \ @ENABLE_SOUT_TRUE@ libstream_out_chromaprint_plugin.la -@ENABLE_SOUT_TRUE@@HAVE_DVBPSI_TRUE@am__append_254 = libmux_ts_plugin.la -@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_255 = -DHAVE_SRTP $(SRTP_CFLAGS) \ +@ENABLE_SOUT_TRUE@@HAVE_DVBPSI_TRUE@am__append_258 = libmux_ts_plugin.la +@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_259 = -DHAVE_SRTP $(SRTP_CFLAGS) \ @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@ $(GCRYPT_CFLAGS) -@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_256 = $(SRTP_LIBS) $(GCRYPT_LIBS) +@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_260 = $(SRTP_LIBS) $(GCRYPT_LIBS) # Chromecast plugin -@ENABLE_SOUT_TRUE@am__append_257 = .proto .pb.cc -@ENABLE_SOUT_TRUE@am__append_258 = $(nodist_libstream_out_chromecast_plugin_la_SOURCES) -@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_259 = stream_out/chromecast/cast_channel.pb.h -@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_260 = libstream_out_chromecast_plugin.la -@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_261 = libdemux_chromecast_plugin.la -@HAVE_WIN32_TRUE@am__append_262 = module.rc.lo -@HAVE_WIN32_TRUE@am__append_263 = module.rc +@ENABLE_SOUT_TRUE@am__append_261 = .proto .pb.cc +@ENABLE_SOUT_TRUE@am__append_262 = $(nodist_libstream_out_chromecast_plugin_la_SOURCES) +@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_263 = stream_out/chromecast/cast_channel.pb.h +@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_264 = libstream_out_chromecast_plugin.la +@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_265 = libdemux_chromecast_plugin.la +@HAVE_WIN32_TRUE@am__append_266 = module.rc.lo +@HAVE_WIN32_TRUE@am__append_267 = module.rc subdir = modules ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -1054,7 +1056,8 @@ am__libavcodec_plugin_la_SOURCES_DIST = codec/avcodec/video.c \ codec/avcodec/subtitle.c codec/avcodec/audio.c \ codec/avcodec/va.c codec/avcodec/va.h codec/avcodec/avcodec.c \ - codec/avcodec/avcodec.h codec/avcodec/encoder.c \ + codec/avcodec/avcodec.h packetizer/av1_obu.c \ + packetizer/av1_obu.h packetizer/av1.h codec/avcodec/encoder.c \ demux/avformat/demux.c access/avio.c packetizer/avparser.c \ demux/avformat/mux.c @ENABLE_SOUT_TRUE@am__objects_1 = codec/avcodec/libavcodec_plugin_la-encoder.lo @@ -1067,7 +1070,8 @@ codec/avcodec/libavcodec_plugin_la-subtitle.lo \ codec/avcodec/libavcodec_plugin_la-audio.lo \ codec/avcodec/libavcodec_plugin_la-va.lo \ - codec/avcodec/libavcodec_plugin_la-avcodec.lo $(am__objects_1) \ + codec/avcodec/libavcodec_plugin_la-avcodec.lo \ + packetizer/libavcodec_plugin_la-av1_obu.lo $(am__objects_1) \ $(am__objects_2) $(am__objects_3) libavcodec_plugin_la_OBJECTS = $(am_libavcodec_plugin_la_OBJECTS) libavcodec_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1523,7 +1527,9 @@ video_output/win32/d3d11_quad.h \ video_output/win32/d3d11_shaders.c \ video_output/win32/d3d11_shaders.h video_output/win32/common.c \ - video_output/win32/common.h video_output/win32/events.c \ + video_output/win32/common.h \ + video_output/win32/d3d11_scaler.cpp \ + video_output/win32/d3d11_scaler.h video_output/win32/events.c \ video_output/win32/events.h video_output/win32/sensors.cpp \ video_output/win32/win32touch.c \ video_output/win32/win32touch.h @@ -1535,6 +1541,7 @@ video_output/win32/libdirect3d11_plugin_la-d3d11_quad.lo \ video_output/win32/libdirect3d11_plugin_la-d3d11_shaders.lo \ video_output/win32/libdirect3d11_plugin_la-common.lo \ + video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo \ $(am__objects_8) libdirect3d11_plugin_la_OBJECTS = \ $(am_libdirect3d11_plugin_la_OBJECTS) @@ -1687,7 +1694,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libdvdread_plugin_la_CFLAGS) $(CFLAGS) \ $(libdvdread_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -libdxva2_plugin_la_DEPENDENCIES = libd3d9_common.la \ +libdxva2_plugin_la_DEPENDENCIES = libd3d9_common.la libchroma_copy.la \ $(am__DEPENDENCIES_1) am_libdxva2_plugin_la_OBJECTS = codec/avcodec/dxva2.lo \ codec/avcodec/directx_va.lo codec/avcodec/va_surface.lo \ @@ -1949,14 +1956,8 @@ @HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@am_libglconv_android_plugin_la_rpath = \ @HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@ -rpath $(voutdir) libglconv_cvpx_plugin_la_LIBADD = -am__libglconv_cvpx_plugin_la_SOURCES_DIST = \ - video_output/opengl/converter_cvpx.c \ - video_output/opengl/converter.h codec/vt_utils.c \ - codec/vt_utils.h -@HAVE_OSX_TRUE@am__objects_19 = \ -@HAVE_OSX_TRUE@ codec/libglconv_cvpx_plugin_la-vt_utils.lo am_libglconv_cvpx_plugin_la_OBJECTS = video_output/opengl/libglconv_cvpx_plugin_la-converter_cvpx.lo \ - $(am__objects_19) + codec/libglconv_cvpx_plugin_la-vt_utils.lo libglconv_cvpx_plugin_la_OBJECTS = \ $(am_libglconv_cvpx_plugin_la_OBJECTS) libglconv_cvpx_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1968,9 +1969,9 @@ @HAVE_TVOS_TRUE@am_libglconv_cvpx_plugin_la_rpath = -rpath $(voutdir) libglconv_vaapi_drm_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__objects_20 = video_output/opengl/libglconv_vaapi_drm_plugin_la-converter_vaapi.lo \ +am__objects_19 = video_output/opengl/libglconv_vaapi_drm_plugin_la-converter_vaapi.lo \ hw/vaapi/libglconv_vaapi_drm_plugin_la-vlc_vaapi.lo -am_libglconv_vaapi_drm_plugin_la_OBJECTS = $(am__objects_20) +am_libglconv_vaapi_drm_plugin_la_OBJECTS = $(am__objects_19) libglconv_vaapi_drm_plugin_la_OBJECTS = \ $(am_libglconv_vaapi_drm_plugin_la_OBJECTS) libglconv_vaapi_drm_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1994,9 +1995,9 @@ libglconv_vaapi_x11_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__objects_21 = video_output/opengl/libglconv_vaapi_x11_plugin_la-converter_vaapi.lo \ +am__objects_20 = video_output/opengl/libglconv_vaapi_x11_plugin_la-converter_vaapi.lo \ hw/vaapi/libglconv_vaapi_x11_plugin_la-vlc_vaapi.lo -am_libglconv_vaapi_x11_plugin_la_OBJECTS = $(am__objects_21) +am_libglconv_vaapi_x11_plugin_la_OBJECTS = $(am__objects_20) libglconv_vaapi_x11_plugin_la_OBJECTS = \ $(am_libglconv_vaapi_x11_plugin_la_OBJECTS) libglconv_vaapi_x11_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -2018,17 +2019,28 @@ @HAVE_GL_TRUE@@HAVE_VDPAU_TRUE@ -rpath $(voutdir) libgles2_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_5) -am__objects_22 = \ +am__objects_21 = \ video_output/opengl/libgles2_plugin_la-vout_helper.lo \ video_output/opengl/libgles2_plugin_la-fragment_shaders.lo \ video_output/opengl/libgles2_plugin_la-converter_sw.lo -am_libgles2_plugin_la_OBJECTS = $(am__objects_22) \ +am_libgles2_plugin_la_OBJECTS = $(am__objects_21) \ video_output/opengl/libgles2_plugin_la-display.lo libgles2_plugin_la_OBJECTS = $(am_libgles2_plugin_la_OBJECTS) libgles2_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgles2_plugin_la_CFLAGS) $(CFLAGS) \ $(libgles2_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ +libglinterop_dxva2_plugin_la_DEPENDENCIES = libchroma_copy.la \ + libd3d9_common.la +am_libglinterop_dxva2_plugin_la_OBJECTS = video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo +libglinterop_dxva2_plugin_la_OBJECTS = \ + $(am_libglinterop_dxva2_plugin_la_OBJECTS) +libglinterop_dxva2_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libglinterop_dxva2_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +@HAVE_GL_TRUE@@HAVE_WIN32_DESKTOP_TRUE@am_libglinterop_dxva2_plugin_la_rpath = \ +@HAVE_GL_TRUE@@HAVE_WIN32_DESKTOP_TRUE@ -rpath $(voutdir) libglspectrum_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libglspectrum_plugin_la_OBJECTS = visualization/glspectrum.lo \ @@ -2038,11 +2050,11 @@ @HAVE_GL_TRUE@am_libglspectrum_plugin_la_rpath = -rpath $(visudir) libglwin32_plugin_la_DEPENDENCIES = libchroma_copy.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_5) -am__objects_23 = \ +am__objects_22 = \ video_output/opengl/libglwin32_plugin_la-vout_helper.lo \ video_output/opengl/libglwin32_plugin_la-fragment_shaders.lo \ video_output/opengl/libglwin32_plugin_la-converter_sw.lo -am_libglwin32_plugin_la_OBJECTS = $(am__objects_23) \ +am_libglwin32_plugin_la_OBJECTS = $(am__objects_22) \ video_output/win32/libglwin32_plugin_la-glwin32.lo \ video_output/win32/libglwin32_plugin_la-common.lo \ video_output/win32/libglwin32_plugin_la-events.lo \ @@ -2252,14 +2264,14 @@ codec/omxil/omxil_core.c codec/omxil/omxil_core.h \ video_output/android/utils.c video_output/android/utils.h \ video_output/android/display.h -@HAVE_ANDROID_TRUE@am__objects_24 = video_output/android/libiomx_plugin_la-utils.lo -am__objects_25 = codec/omxil/libiomx_plugin_la-utils.lo \ +@HAVE_ANDROID_TRUE@am__objects_23 = video_output/android/libiomx_plugin_la-utils.lo +am__objects_24 = codec/omxil/libiomx_plugin_la-utils.lo \ packetizer/libiomx_plugin_la-h264_nal.lo \ packetizer/libiomx_plugin_la-hevc_nal.lo \ codec/omxil/libiomx_plugin_la-qcom.lo \ codec/omxil/libiomx_plugin_la-omxil.lo \ - codec/omxil/libiomx_plugin_la-omxil_core.lo $(am__objects_24) -am_libiomx_plugin_la_OBJECTS = $(am__objects_25) + codec/omxil/libiomx_plugin_la-omxil_core.lo $(am__objects_23) +am_libiomx_plugin_la_OBJECTS = $(am__objects_24) libiomx_plugin_la_OBJECTS = $(am_libiomx_plugin_la_OBJECTS) @HAVE_ANDROID_TRUE@am_libiomx_plugin_la_rpath = -rpath $(codecdir) libjack_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -2397,7 +2409,7 @@ lua/libs/strings.c lua/libs/variables.c lua/libs/variables.h \ lua/libs/video.c lua/libs/vlm.c lua/libs/volume.c \ lua/libs/xml.c lua/libs/io.c lua/libs/errno.c lua/libs/win.c -@HAVE_WIN32_TRUE@am__objects_26 = lua/libs/liblua_plugin_la-win.lo +@HAVE_WIN32_TRUE@am__objects_25 = lua/libs/liblua_plugin_la-win.lo am_liblua_plugin_la_OBJECTS = lua/liblua_plugin_la-extension.lo \ lua/liblua_plugin_la-extension_thread.lo \ lua/liblua_plugin_la-intf.lo lua/liblua_plugin_la-meta.lo \ @@ -2425,7 +2437,7 @@ lua/libs/liblua_plugin_la-volume.lo \ lua/libs/liblua_plugin_la-xml.lo \ lua/libs/liblua_plugin_la-io.lo \ - lua/libs/liblua_plugin_la-errno.lo $(am__objects_26) + lua/libs/liblua_plugin_la-errno.lo $(am__objects_25) liblua_plugin_la_OBJECTS = $(am_liblua_plugin_la_OBJECTS) liblua_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -2859,14 +2871,14 @@ codec/omxil/omxil_core.c codec/omxil/omxil_core.h \ video_output/android/utils.c video_output/android/utils.h \ video_output/android/display.h -@HAVE_ANDROID_TRUE@am__objects_27 = video_output/android/libomxil_plugin_la-utils.lo +@HAVE_ANDROID_TRUE@am__objects_26 = video_output/android/libomxil_plugin_la-utils.lo am_libomxil_plugin_la_OBJECTS = \ codec/omxil/libomxil_plugin_la-utils.lo \ packetizer/libomxil_plugin_la-h264_nal.lo \ packetizer/libomxil_plugin_la-hevc_nal.lo \ codec/omxil/libomxil_plugin_la-qcom.lo \ codec/omxil/libomxil_plugin_la-omxil.lo \ - codec/omxil/libomxil_plugin_la-omxil_core.lo $(am__objects_27) + codec/omxil/libomxil_plugin_la-omxil_core.lo $(am__objects_26) libomxil_plugin_la_OBJECTS = $(am_libomxil_plugin_la_OBJECTS) libomxil_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -3249,7 +3261,7 @@ gui/qt/styles/seekstyle.cpp gui/qt/styles/seekstyle.hpp \ gui/qt/main_interface_win32.cpp \ gui/qt/main_interface_win32.hpp -@HAVE_WIN32_TRUE@am__objects_28 = gui/qt/libqt_plugin_la-main_interface_win32.lo +@HAVE_WIN32_TRUE@am__objects_27 = gui/qt/libqt_plugin_la-main_interface_win32.lo am_libqt_plugin_la_OBJECTS = gui/qt/libqt_plugin_la-qt.lo \ gui/qt/libqt_plugin_la-menus.lo \ gui/qt/libqt_plugin_la-main_interface.lo \ @@ -3323,9 +3335,9 @@ gui/qt/util/buttons/libqt_plugin_la-DeckButtonsLayout.lo \ gui/qt/util/buttons/libqt_plugin_la-RoundButton.lo \ gui/qt/util/libqt_plugin_la-imagehelper.lo \ - gui/qt/styles/libqt_plugin_la-seekstyle.lo $(am__objects_28) -@HAVE_WIN32_TRUE@am__objects_29 = gui/qt/libqt_plugin_la-main_interface_win32.moc.lo -@ENABLE_VLM_TRUE@am__objects_30 = \ + gui/qt/styles/libqt_plugin_la-seekstyle.lo $(am__objects_27) +@HAVE_WIN32_TRUE@am__objects_28 = gui/qt/libqt_plugin_la-main_interface_win32.moc.lo +@ENABLE_VLM_TRUE@am__objects_29 = \ @ENABLE_VLM_TRUE@ gui/qt/dialogs/libqt_plugin_la-vlm.moc.lo nodist_libqt_plugin_la_OBJECTS = \ gui/qt/libqt_plugin_la-main_interface.moc.lo \ @@ -3396,8 +3408,8 @@ gui/qt/util/buttons/libqt_plugin_la-DeckButtonsLayout.moc.lo \ gui/qt/util/buttons/libqt_plugin_la-BrowseButton.moc.lo \ gui/qt/styles/libqt_plugin_la-seekstyle.moc.lo \ - $(am__objects_29) gui/qt/libqt_plugin_la-resources.lo \ - $(am__objects_30) + $(am__objects_28) gui/qt/libqt_plugin_la-resources.lo \ + $(am__objects_29) libqt_plugin_la_OBJECTS = $(am_libqt_plugin_la_OBJECTS) \ $(nodist_libqt_plugin_la_OBJECTS) libqt_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ @@ -3513,9 +3525,9 @@ am_libscale_plugin_la_OBJECTS = video_filter/scale.lo libscale_plugin_la_OBJECTS = $(am_libscale_plugin_la_OBJECTS) libscaletempo_pitch_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_5) -am__objects_31 = \ +am__objects_30 = \ audio_filter/libscaletempo_pitch_plugin_la-scaletempo.lo -am_libscaletempo_pitch_plugin_la_OBJECTS = $(am__objects_31) +am_libscaletempo_pitch_plugin_la_OBJECTS = $(am__objects_30) libscaletempo_pitch_plugin_la_OBJECTS = \ $(am_libscaletempo_pitch_plugin_la_OBJECTS) libscaletempo_pitch_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -3542,10 +3554,10 @@ am__libscreen_plugin_la_SOURCES_DIST = access/screen/screen.c \ access/screen/screen.h access/screen/win32.c \ access/screen/mac.c -@HAVE_WIN32_DESKTOP_TRUE@am__objects_32 = access/screen/win32.lo -@HAVE_MAC_SCREEN_TRUE@am__objects_33 = access/screen/mac.lo +@HAVE_WIN32_DESKTOP_TRUE@am__objects_31 = access/screen/win32.lo +@HAVE_MAC_SCREEN_TRUE@am__objects_32 = access/screen/mac.lo am_libscreen_plugin_la_OBJECTS = access/screen/screen.lo \ - $(am__objects_32) $(am__objects_33) + $(am__objects_31) $(am__objects_32) libscreen_plugin_la_OBJECTS = $(am_libscreen_plugin_la_OBJECTS) libscreen_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -3832,7 +3844,7 @@ gui/skins2/x11/x11_timer.hpp gui/skins2/x11/x11_window.cpp \ gui/skins2/x11/x11_window.hpp gui/skins2/x11/x11_tooltip.cpp \ gui/skins2/x11/x11_tooltip.hpp -@HAVE_WIN32_TRUE@am__objects_34 = gui/skins2/win32/libskins2_plugin_la-win32_dragdrop.lo \ +@HAVE_WIN32_TRUE@am__objects_33 = gui/skins2/win32/libskins2_plugin_la-win32_dragdrop.lo \ @HAVE_WIN32_TRUE@ gui/skins2/win32/libskins2_plugin_la-win32_factory.lo \ @HAVE_WIN32_TRUE@ gui/skins2/win32/libskins2_plugin_la-win32_graphics.lo \ @HAVE_WIN32_TRUE@ gui/skins2/win32/libskins2_plugin_la-win32_loop.lo \ @@ -3841,7 +3853,7 @@ @HAVE_WIN32_TRUE@ gui/skins2/win32/libskins2_plugin_la-win32_tooltip.lo \ @HAVE_WIN32_TRUE@ gui/skins2/win32/libskins2_plugin_la-win32_window.lo \ @HAVE_WIN32_TRUE@ $(am__objects_10) -@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@am__objects_35 = gui/skins2/os2/libskins2_plugin_la-os2_dragdrop.lo \ +@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@am__objects_34 = gui/skins2/os2/libskins2_plugin_la-os2_dragdrop.lo \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/libskins2_plugin_la-os2_factory.lo \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/libskins2_plugin_la-os2_graphics.lo \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/libskins2_plugin_la-os2_loop.lo \ @@ -3850,7 +3862,7 @@ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/libskins2_plugin_la-os2_tooltip.lo \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/libskins2_plugin_la-os2_window.lo \ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ $(am__objects_10) -@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@am__objects_36 = gui/skins2/x11/libskins2_plugin_la-x11_display.lo \ +@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@am__objects_35 = gui/skins2/x11/libskins2_plugin_la-x11_display.lo \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/libskins2_plugin_la-x11_dragdrop.lo \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/libskins2_plugin_la-x11_factory.lo \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/libskins2_plugin_la-x11_graphics.lo \ @@ -3943,7 +3955,7 @@ gui/skins2/vars/libskins2_plugin_la-playtree.lo \ gui/skins2/vars/libskins2_plugin_la-time.lo \ gui/skins2/vars/libskins2_plugin_la-volume.lo \ - $(am__objects_34) $(am__objects_35) $(am__objects_36) + $(am__objects_33) $(am__objects_34) $(am__objects_35) libskins2_plugin_la_OBJECTS = $(am_libskins2_plugin_la_OBJECTS) libskins2_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ @@ -4727,10 +4739,10 @@ libvlc_motion_la_LIBADD = am__libvlc_motion_la_SOURCES_DIST = control/motionlib.c \ control/motionlib.h control/unimotion.c control/unimotion.h -@HAVE_DARWIN_TRUE@am__objects_37 = \ +@HAVE_DARWIN_TRUE@am__objects_36 = \ @HAVE_DARWIN_TRUE@ control/libvlc_motion_la-unimotion.lo am_libvlc_motion_la_OBJECTS = control/libvlc_motion_la-motionlib.lo \ - $(am__objects_37) + $(am__objects_36) libvlc_motion_la_OBJECTS = $(am_libvlc_motion_la_OBJECTS) libvlc_motion_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -4813,12 +4825,12 @@ $(libvorbis_plugin_la_CFLAGS) $(CFLAGS) \ $(libvorbis_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libvout_ios_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_5) -am__objects_38 = \ +am__objects_37 = \ video_output/opengl/libvout_ios_plugin_la-vout_helper.lo \ video_output/opengl/libvout_ios_plugin_la-fragment_shaders.lo \ video_output/opengl/libvout_ios_plugin_la-converter_sw.lo am_libvout_ios_plugin_la_OBJECTS = video_output/ios.lo \ - $(am__objects_38) + $(am__objects_37) libvout_ios_plugin_la_OBJECTS = $(am_libvout_ios_plugin_la_OBJECTS) libvout_ios_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \ @@ -4833,12 +4845,12 @@ video_output/opengl/converter.h video_output/opengl/internal.h \ video_output/opengl/fragment_shaders.c \ video_output/opengl/converter_sw.c -am__objects_39 = \ +am__objects_38 = \ video_output/opengl/libvout_macosx_plugin_la-vout_helper.lo \ video_output/opengl/libvout_macosx_plugin_la-fragment_shaders.lo \ video_output/opengl/libvout_macosx_plugin_la-converter_sw.lo @HAVE_OSX_TRUE@am_libvout_macosx_plugin_la_OBJECTS = \ -@HAVE_OSX_TRUE@ video_output/macosx.lo $(am__objects_39) +@HAVE_OSX_TRUE@ video_output/macosx.lo $(am__objects_38) libvout_macosx_plugin_la_OBJECTS = \ $(am_libvout_macosx_plugin_la_OBJECTS) libvout_macosx_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) \ @@ -4887,25 +4899,25 @@ codec/webvtt/CSSLexer.l codec/webvtt/css_parser.c \ codec/webvtt/css_parser.h codec/webvtt/css_style.c \ codec/webvtt/css_style.h codec/webvtt/css_bridge.h -@ENABLE_CSS_TRUE@am__objects_40 = codec/webvtt/libwebvtt_plugin_la-CSSGrammar.lo \ +@ENABLE_CSS_TRUE@am__objects_39 = codec/webvtt/libwebvtt_plugin_la-CSSGrammar.lo \ @ENABLE_CSS_TRUE@ codec/webvtt/libwebvtt_plugin_la-CSSLexer.lo \ @ENABLE_CSS_TRUE@ codec/webvtt/libwebvtt_plugin_la-css_parser.lo \ @ENABLE_CSS_TRUE@ codec/webvtt/libwebvtt_plugin_la-css_style.lo am_libwebvtt_plugin_la_OBJECTS = \ codec/webvtt/libwebvtt_plugin_la-subsvtt.lo \ codec/webvtt/libwebvtt_plugin_la-webvtt.lo \ - demux/libwebvtt_plugin_la-webvtt.lo $(am__objects_40) + demux/libwebvtt_plugin_la-webvtt.lo $(am__objects_39) libwebvtt_plugin_la_OBJECTS = $(am_libwebvtt_plugin_la_OBJECTS) libwebvtt_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libwebvtt_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ libwgl_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_5) -am__objects_41 = video_output/opengl/libwgl_plugin_la-vout_helper.lo \ +am__objects_40 = video_output/opengl/libwgl_plugin_la-vout_helper.lo \ video_output/opengl/libwgl_plugin_la-fragment_shaders.lo \ video_output/opengl/libwgl_plugin_la-converter_sw.lo am_libwgl_plugin_la_OBJECTS = \ - video_output/win32/libwgl_plugin_la-wgl.lo $(am__objects_41) + video_output/win32/libwgl_plugin_la-wgl.lo $(am__objects_40) libwgl_plugin_la_OBJECTS = $(am_libwgl_plugin_la_OBJECTS) libwgl_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -5171,16 +5183,16 @@ demux/adaptive/test/test.$(OBJEXT) adaptive_test_OBJECTS = $(am_adaptive_test_OBJECTS) adaptive_test_DEPENDENCIES = libvlc_adaptive.la -am__objects_42 = video_chroma/chroma_copy_sse_test-copy.$(OBJEXT) -am_chroma_copy_sse_test_OBJECTS = $(am__objects_42) +am__objects_41 = video_chroma/chroma_copy_sse_test-copy.$(OBJEXT) +am_chroma_copy_sse_test_OBJECTS = $(am__objects_41) chroma_copy_sse_test_OBJECTS = $(am_chroma_copy_sse_test_OBJECTS) chroma_copy_sse_test_DEPENDENCIES = ../src/libvlccore.la chroma_copy_sse_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(chroma_copy_sse_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -am__objects_43 = video_chroma/chroma_copy_test-copy.$(OBJEXT) -am_chroma_copy_test_OBJECTS = $(am__objects_43) +am__objects_42 = video_chroma/chroma_copy_test-copy.$(OBJEXT) +am_chroma_copy_test_OBJECTS = $(am__objects_42) chroma_copy_test_OBJECTS = $(am_chroma_copy_test_OBJECTS) chroma_copy_test_DEPENDENCIES = ../src/libvlccore.la chroma_copy_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -5210,8 +5222,8 @@ hpack_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(hpack_test_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am__objects_44 = access/http/hpackenc_test-hpack.$(OBJEXT) -am_hpackenc_test_OBJECTS = $(am__objects_44) \ +am__objects_43 = access/http/hpackenc_test-hpack.$(OBJEXT) +am_hpackenc_test_OBJECTS = $(am__objects_43) \ access/http/hpackenc_test-hpackenc.$(OBJEXT) hpackenc_test_OBJECTS = $(am_hpackenc_test_OBJECTS) hpackenc_test_LDADD = $(LDADD) @@ -6229,6 +6241,7 @@ packetizer/$(DEPDIR)/hxxx_common.Plo \ packetizer/$(DEPDIR)/hxxx_nal.Plo \ packetizer/$(DEPDIR)/hxxx_sei.Plo \ + packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Plo \ packetizer/$(DEPDIR)/libavcodec_plugin_la-avparser.Plo \ packetizer/$(DEPDIR)/libiomx_plugin_la-h264_nal.Plo \ packetizer/$(DEPDIR)/libiomx_plugin_la-hevc_nal.Plo \ @@ -6452,6 +6465,7 @@ video_output/opengl/$(DEPDIR)/libgles2_plugin_la-display.Plo \ video_output/opengl/$(DEPDIR)/libgles2_plugin_la-fragment_shaders.Plo \ video_output/opengl/$(DEPDIR)/libgles2_plugin_la-vout_helper.Plo \ + video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Plo \ video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-converter_sw.Plo \ video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-fragment_shaders.Plo \ video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Plo \ @@ -6475,6 +6489,7 @@ video_output/win32/$(DEPDIR)/inhibit.Plo \ video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-common.Plo \ video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_quad.Plo \ + video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Plo \ video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_shaders.Plo \ video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-direct3d11.Plo \ video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-events.Plo \ @@ -6733,6 +6748,7 @@ $(libglconv_vaapi_x11_plugin_la_SOURCES) \ $(libglconv_vdpau_plugin_la_SOURCES) \ $(libgles2_plugin_la_SOURCES) \ + $(libglinterop_dxva2_plugin_la_SOURCES) \ $(libglspectrum_plugin_la_SOURCES) \ $(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \ $(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \ @@ -7126,12 +7142,13 @@ $(libgaussianblur_plugin_la_SOURCES) \ $(libgestures_plugin_la_SOURCES) $(libgl_plugin_la_SOURCES) \ $(libglconv_android_plugin_la_SOURCES) \ - $(am__libglconv_cvpx_plugin_la_SOURCES_DIST) \ + $(libglconv_cvpx_plugin_la_SOURCES) \ $(libglconv_vaapi_drm_plugin_la_SOURCES) \ $(libglconv_vaapi_wl_plugin_la_SOURCES) \ $(libglconv_vaapi_x11_plugin_la_SOURCES) \ $(libglconv_vdpau_plugin_la_SOURCES) \ $(libgles2_plugin_la_SOURCES) \ + $(libglinterop_dxva2_plugin_la_SOURCES) \ $(libglspectrum_plugin_la_SOURCES) \ $(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \ $(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \ @@ -9018,13 +9035,13 @@ vlcdatadir = @vlcdatadir@ vlclibdir = @vlclibdir@ noinst_LTLIBRARIES = $(am__append_34) libvlc_http.la $(am__append_43) \ - $(am__append_86) $(am__append_90) $(am__append_92) \ - libvlc_motion.la libxiph_metadata.la $(am__append_111) \ + $(am__append_89) $(am__append_93) $(am__append_95) \ + libvlc_motion.la libxiph_metadata.la $(am__append_114) \ libvlc_adaptive.la libchroma_copy.la libdeinterlace_common.la \ libevent_thread.la check_LTLIBRARIES = libaccesstweaks_plugin.la -pkglib_LTLIBRARIES = $(am__append_58) $(am__append_147) \ - $(am__append_226) +pkglib_LTLIBRARIES = $(am__append_58) $(am__append_150) \ + $(am__append_229) ### OpenMAX ### noinst_HEADERS = codec/omxil/OMX_Broadcom.h \ @@ -9165,7 +9182,7 @@ libcrystalhd_plugin.la libqsv_plugin.la libogg_plugin.la \ libmod_plugin.la libmpc_plugin.la libgme_plugin.la \ libsid_plugin.la libmkv_plugin.la libminimal_macosx_plugin.la \ - $(am__append_145) libdirect3d11_filters_plugin.la \ + $(am__append_148) libdirect3d11_filters_plugin.la \ libsecret_plugin.la libkwallet_plugin.la libtaglib_plugin.la \ libgnutls_plugin.la libxml_plugin.la \ libosx_notifications_plugin.la libnotify_plugin.la \ @@ -9175,18 +9192,18 @@ libchroma_omx_plugin.la libcvpx_plugin.la \ libopencv_wrapper_plugin.la libpostproc_plugin.la \ libopencv_example_plugin.la libgles2_plugin.la \ - $(am__append_236) libdirect3d11_plugin.la $(am__append_241) \ + $(am__append_239) libdirect3d11_plugin.la $(am__append_245) \ libfb_plugin.la libaa_plugin.la libcaca_plugin.la \ libgoom_plugin.la libprojectm_plugin.la libvsxu_plugin.la \ - $(am__append_253) + $(am__append_257) AUTOMAKE_OPTIONS = subdir-objects NULL = pluginsdir = $(vlclibdir)/plugins -BUILT_SOURCES = $(am__append_77) $(am__append_124) $(am__append_140) \ - $(am__append_232) $(am__append_259) dummy.cpp \ - $(am__append_262) +BUILT_SOURCES = $(am__append_78) $(am__append_127) $(am__append_143) \ + $(am__append_235) $(am__append_263) dummy.cpp \ + $(am__append_266) CLEANFILES = $(BUILT_SOURCES) $(nodist_libwl_shm_plugin_la_SOURCES) \ - $(am__append_258) $(am__append_263) + $(am__append_262) $(am__append_267) LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la # Module name from object or executable file name. @@ -9201,7 +9218,7 @@ AM_YFLAGS = -d # Wayland -SUFFIXES = .l .y .xib .ui .h .hpp .moc.cpp $(am__append_257) \ +SUFFIXES = .l .y .xib .ui .h .hpp .moc.cpp $(am__append_261) \ -client-protocol.h -protocol.c .xml accessdir = $(pluginsdir)/access @@ -9615,7 +9632,7 @@ libtrivial_channel_mixer_plugin.la $(LTLIBspatialaudio) \ libtospdif_plugin.la libaudio_format_plugin.la \ $(LTLIBsamplerate) $(LTLIBsoxr) libugly_resampler_plugin.la \ - $(am__append_54) $(am__append_73) + $(am__append_54) $(am__append_74) # Channel mixers libdolby_surround_decoder_plugin_la_SOURCES = \ @@ -9750,7 +9767,7 @@ audio_output/coreaudio_common.c audio_output/coreaudio_common.h libaudiounit_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(aoutdir)' \ - -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices,-framework,UIKit,-framework,AVFoundation + -Wl,-framework,Foundation,-framework,CoreAudio,-framework,AudioToolbox,-framework,UIKit,-framework,AVFoundation libtizen_audio_plugin_la_SOURCES = audio_output/tizen_audio.c libtizen_audio_plugin_la_CFLAGS = $(AM_CFLAGS) @@ -9761,24 +9778,24 @@ libg711_plugin.la $(LTLIBfluidsynth) $(LTLIBaudiotoolboxmidi) \ liblpcm_plugin.la $(LTLIBmpg123) libuleaddvaudio_plugin.la \ $(LTLIBwma_fixed) libcdg_plugin.la $(LTLIBlibmpeg2) \ - librawvideo_plugin.la $(am__append_74) $(LTLIBschroedinger) \ + librawvideo_plugin.la $(am__append_75) $(LTLIBschroedinger) \ $(LTLIBpng) $(LTLIBjpeg) $(LTLIBbpg) $(LTLIBsvgdec) \ - $(LTLIBsdl_image) $(am__append_75) $(LTLIBlibass) \ + $(LTLIBsdl_image) $(am__append_76) $(LTLIBlibass) \ libcc_plugin.la libcvdsub_plugin.la libdvbsub_plugin.la \ $(LTLIBaribsub) libscte18_plugin.la libscte27_plugin.la \ libspudec_plugin.la libstl_plugin.la libsubsdec_plugin.la \ libsubsusf_plugin.la libttml_plugin.la libwebvtt_plugin.la \ - libsvcdsub_plugin.la $(am__append_79) $(LTLIBtelx) \ + libsvcdsub_plugin.la $(am__append_80) $(LTLIBtelx) \ libtextst_plugin.la $(LTLIBzvbi) libsubstx3g_plugin.la \ $(LTLIBflac) $(LTLIBkate) $(LTLIBopus) $(LTLIBspeex) \ $(LTLIBtheora) $(LTLIBdaala) $(LTLIBtremor) $(LTLIBvorbis) \ - $(LTLIBoggspots) $(LTLIBvideotoolbox) $(am__append_87) \ - $(am__append_88) $(am__append_89) $(am__append_91) \ - $(am__append_94) $(LTLIBomxil) $(LTLIBomxil_vout) \ - $(am__append_96) $(LTLIBx265) $(LTLIBx262) $(LTLIBx264) \ + $(LTLIBoggspots) $(LTLIBvideotoolbox) $(am__append_90) \ + $(am__append_91) $(am__append_92) $(am__append_94) \ + $(am__append_97) $(LTLIBomxil) $(LTLIBomxil_vout) \ + $(am__append_99) $(LTLIBx265) $(LTLIBx262) $(LTLIBx264) \ $(LTLIBx26410b) $(LTLIBfdkaac) $(LTLIBshine) $(LTLIBvpx) \ $(LTLIBaom) $(LTLIBtwolame) $(LTLIBdav1d) $(LTLIBcrystalhd) \ - $(LTLIBqsv) $(am__append_98) $(am__append_99) + $(LTLIBqsv) $(am__append_101) $(am__append_102) libddummy_plugin_la_SOURCES = codec/ddummy.c libedummy_plugin_la_SOURCES = codec/edummy.c @@ -9809,7 +9826,8 @@ libaudiotoolboxmidi_plugin_la_SOURCES = codec/audiotoolbox_midi.c libaudiotoolboxmidi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath \ '$(codecdir)' \ - -Wl,-framework,CoreFoundation,-framework,AudioUnit,-framework,AudioToolbox + -Wl,-framework,CoreFoundation,-framework,AudioToolbox \ + $(am__append_73) liblpcm_plugin_la_SOURCES = codec/lpcm.c libmad_plugin_la_SOURCES = codec/mad.c libmad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(MAD_CFLAGS) @@ -9875,7 +9893,7 @@ liblibass_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBASS_CFLAGS) liblibass_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' liblibass_plugin_la_LIBADD = $(LIBASS_LIBS) $(LIBS_libass) \ - $(LIBS_freetype) $(FREETYPE_LIBS) $(am__append_76) + $(LIBS_freetype) $(FREETYPE_LIBS) $(am__append_77) libcc_plugin_la_SOURCES = codec/cc.c codec/cc.h codec/substext.h \ codec/cea708.h codec/cea708.c @@ -9900,7 +9918,7 @@ libwebvtt_plugin_la_SOURCES = codec/webvtt/subsvtt.c \ codec/webvtt/webvtt.c codec/webvtt/webvtt.h demux/webvtt.c \ - demux/mp4/minibox.h $(am__append_78) + demux/mp4/minibox.h $(am__append_79) @ENABLE_CSS_TRUE@libwebvtt_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/codec/webvtt/ -I$(builddir)/codec/webvtt/ libsvcdsub_plugin_la_SOURCES = codec/svcdsub.c libt140_plugin_la_SOURCES = codec/t140.c @@ -9960,11 +9978,14 @@ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h +libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' \ + -Wl,-framework,Foundation -Wl,-framework,VideoToolbox \ + -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo \ + $(am__append_81) $(am__append_82) @HAVE_IOS_TRUE@libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -miphoneos-version-min=8.0 @HAVE_OSX_TRUE@libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -mmacosx-version-min=10.8 @HAVE_TVOS_TRUE@libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -mtvos-version-min=10.2 libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la -libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo ### FFmpeg/libav ### libavcodec_common_la_SOURCES = codec/avcodec/fourcc.c codec/avcodec/avcommon.h \ @@ -9976,14 +9997,15 @@ libavcodec_plugin_la_SOURCES = codec/avcodec/video.c \ codec/avcodec/subtitle.c codec/avcodec/audio.c \ codec/avcodec/va.c codec/avcodec/va.h codec/avcodec/avcodec.c \ - codec/avcodec/avcodec.h $(am__append_80) $(am__append_81) \ - $(am__append_84) + codec/avcodec/avcodec.h packetizer/av1_obu.c \ + packetizer/av1_obu.h packetizer/av1.h $(am__append_83) \ + $(am__append_84) $(am__append_87) libavcodec_plugin_la_CFLAGS = $(AVCODEC_CFLAGS) $(AM_CFLAGS) \ - $(am__append_82) + $(am__append_85) libavcodec_plugin_la_LIBADD = $(AVCODEC_LIBS) $(LIBM) \ - libavcodec_common.la $(am__append_83) + libavcodec_common.la $(am__append_86) libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) \ - $(am__append_85) + $(am__append_88) ### avcodec hardware acceleration ### libvaapi_drm_plugin_la_SOURCES = \ @@ -10011,7 +10033,7 @@ packetizer/hevc_nal.c packetizer/hevc_nal.h \ codec/avcodec/dxva_blacklist.c -libdxva2_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) -lshlwapi -luuid +libdxva2_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la $(LIBCOM) -lshlwapi -luuid libd3d11_common_la_SOURCES = video_chroma/d3d11_fmt.c video_chroma/d3d11_fmt.h \ video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h @@ -10024,14 +10046,14 @@ codec/avcodec/dxva_blacklist.c libd3d11va_plugin_la_LIBADD = libd3d11_common.la $(LIBCOM) -luuid \ - $(am__append_93) + $(am__append_96) libomxil_plugin_la_SOURCES = codec/omxil/utils.c \ codec/omxil/omxil_utils.h packetizer/h264_nal.c \ packetizer/h264_nal.h packetizer/hevc_nal.c \ packetizer/hevc_nal.h codec/omxil/qcom.c codec/omxil/qcom.h \ codec/omxil/omxil.c codec/omxil/omxil.h \ codec/omxil/omxil_core.c codec/omxil/omxil_core.h \ - $(am__append_95) + $(am__append_98) libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil) libomxil_plugin_la_LIBADD = libchroma_copy.la $(LIBDL) libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' @@ -10052,7 +10074,7 @@ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h -libmediacodec_plugin_la_LIBADD = libchroma_copy.la +libmediacodec_plugin_la_LIBADD = libchroma_copy.la ### X26x encoders ### libx265_plugin_la_SOURCES = codec/x265.c @@ -10119,7 +10141,7 @@ ### External frameworks ### libdmo_plugin_la_SOURCES = codec/dmo/dmo.c codec/dmo/dmo.h codec/dmo/buffer.c libqsv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -libdmo_plugin_la_LIBADD = $(LIBM) $(am__append_97) +libdmo_plugin_la_LIBADD = $(LIBM) $(am__append_100) libmft_plugin_la_SOURCES = codec/mft.c packetizer/h264_nal.c packetizer/h264_nal.h @HAVE_WIN32_TRUE@libmft_plugin_la_LIBADD = $(LIBCOM) -luuid -lmfuuid -lmfplat libgstdecode_plugin_la_SOURCES = codec/gstreamer/gstdecode.c \ @@ -10144,18 +10166,18 @@ liboldrc_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM) control_LTLIBRARIES = libdummy_plugin.la libgestures_plugin.la \ libhotkeys_plugin.la libnetsync_plugin.la liboldrc_plugin.la \ - $(am__append_100) $(am__append_103) $(am__append_104) \ - $(am__append_105) $(am__append_106) + $(am__append_103) $(am__append_106) $(am__append_107) \ + $(am__append_108) $(am__append_109) liblirc_plugin_la_SOURCES = control/lirc.c liblirc_plugin_la_LIBADD = -llirc_client libvlc_motion_la_SOURCES = control/motionlib.c control/motionlib.h \ - $(am__append_101) + $(am__append_104) @HAVE_DARWIN_TRUE@libvlc_motion_la_CFLAGS = $(AM_CFLAGS) -fconstant-cfstrings libvlc_motion_la_LDFLAGS = -static libmotion_plugin_la_SOURCES = control/motion.c libmotion_plugin_la_LIBADD = libvlc_motion.la libmotion_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)' \ - $(am__append_102) + $(am__append_105) libdbus_plugin_la_SOURCES = \ control/dbus/dbus_introspect.h control/dbus/dbus_common.h \ control/dbus/dbus_root.c control/dbus/dbus_root.h \ @@ -10185,11 +10207,11 @@ libdemux_cdg_plugin.la libsmf_plugin.la $(LTLIBgme) \ $(LTLIBsid) libdiracsys_plugin.la libimage_plugin.la \ libdemux_stl_plugin.la libasf_plugin.la libavi_plugin.la \ - libcaf_plugin.la $(am__append_110) \ + libcaf_plugin.la $(am__append_113) \ libdirectory_demux_plugin.la libes_plugin.la libh26x_plugin.la \ $(LTLIBmkv) libmp4_plugin.la libmpgv_plugin.la \ - libplaylist_plugin.la $(am__append_116) libadaptive_plugin.la \ - libnoseek_plugin.la $(am__append_261) + libplaylist_plugin.la $(am__append_119) libadaptive_plugin.la \ + libnoseek_plugin.la $(am__append_265) libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c libxiph_metadata_la_LDFLAGS = -static libflacsys_plugin_la_SOURCES = demux/flac.c packetizer/flac.h @@ -10257,12 +10279,12 @@ libcaf_plugin_la_LIBADD = $(LIBM) libavformat_plugin_la_SOURCES = demux/avformat/demux.c demux/vobsub.h \ demux/avformat/avformat.c demux/avformat/avformat.h \ - $(am__append_107) + $(am__append_110) libavformat_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) libavformat_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) \ - libavcodec_common.la $(am__append_108) + libavcodec_common.la $(am__append_111) libavformat_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) \ - $(am__append_109) + $(am__append_112) libdirectory_demux_plugin_la_SOURCES = demux/directory.c libes_plugin_la_SOURCES = demux/mpeg/es.c \ meta_engine/ID3Tag.h \ @@ -10292,7 +10314,7 @@ packetizer/dts_header.c libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_mkv) libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' -libmkv_plugin_la_LIBADD = $(LIBS_mkv) $(am__append_112) +libmkv_plugin_la_LIBADD = $(LIBS_mkv) $(am__append_115) libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/mp4.h \ demux/mp4/fragments.c demux/mp4/fragments.h \ demux/mp4/libmp4.c demux/mp4/libmp4.h \ @@ -10305,7 +10327,7 @@ packetizer/iso_color_tables.h \ meta_engine/ID3Genres.h -libmp4_plugin_la_LIBADD = $(LIBM) $(am__append_113) +libmp4_plugin_la_LIBADD = $(LIBM) $(am__append_116) libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS) libmpgv_plugin_la_SOURCES = demux/mpeg/mpgv.c libplaylist_plugin_la_SOURCES = \ @@ -10357,9 +10379,9 @@ codec/opus_header.c libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS) \ - $(am__append_114) + $(am__append_117) libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS) \ - $(am__append_115) + $(am__append_118) # DASH specific # HLS specific # smooth streaming specific @@ -10522,10 +10544,10 @@ mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h packetizer/h264_nal.c \ packetizer/hevc_nal.c libvlc_adaptive_la_CXXFLAGS = $(AM_CXXFLAGS) \ - -I$(srcdir)/demux/adaptive $(am__append_119) + -I$(srcdir)/demux/adaptive $(am__append_122) libvlc_adaptive_la_LIBADD = $(SOCKET_LIBS) $(LIBM) libvlc_http.la \ - $(am__append_118) $(am__append_120) -libvlc_adaptive_la_LDFLAGS = -static $(am__append_117) + $(am__append_121) $(am__append_123) +libvlc_adaptive_la_LDFLAGS = -static $(am__append_120) libadaptive_plugin_la_SOURCES = demux/adaptive/adaptive.cpp libadaptive_plugin_la_CXXFLAGS = $(libvlc_adaptive_la_CXXFLAGS) libadaptive_plugin_la_LIBADD = libvlc_adaptive.la @@ -10548,8 +10570,8 @@ adaptive_test_LDADD = libvlc_adaptive.la libnoseek_plugin_la_SOURCES = demux/filter/noseek.c guidir = $(pluginsdir)/gui -gui_LTLIBRARIES = $(am__append_121) $(LTLIBminimal_macosx) \ - $(am__append_123) $(am__append_139) $(am__append_144) +gui_LTLIBRARIES = $(am__append_124) $(LTLIBminimal_macosx) \ + $(am__append_126) $(am__append_142) $(am__append_147) libncurses_plugin_la_SOURCES = gui/ncurses.c libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS) libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM) @@ -10569,7 +10591,7 @@ -Wl,-framework,WebKit -Wl,-framework,CoreAudio \ -Wl,-framework,SystemConfiguration \ -Wl,-framework,ScriptingBridge -Wl,-framework,QuartzCore \ - -Wl,-weak_framework,MediaPlayer $(am__append_122) + -Wl,-weak_framework,MediaPlayer $(am__append_125) # PXSourceList sources libmacosx_plugin_la_SOURCES = gui/macosx/helpers.h \ @@ -11297,13 +11319,13 @@ @ENABLE_MACOSX_UI_TRUE@dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES) libmacosx_plugin_ladir = $(prefix)/share/macosx/Contents/Resources libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/gui/qt \ - -I$(builddir)/gui/qt $(am__append_129) $(am__append_133) + -I$(builddir)/gui/qt $(am__append_132) $(am__append_136) libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt) \ - $(am__append_126) $(am__append_128) $(am__append_130) + $(am__append_129) $(am__append_131) $(am__append_133) libqt_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) $(LIBM) \ - $(am__append_127) $(am__append_131) $(am__append_132) + $(am__append_130) $(am__append_134) $(am__append_135) libqt_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \ - $(am__append_125) + $(am__append_128) libqt_plugin_la_SOURCES = gui/qt/qt.cpp gui/qt/qt.hpp gui/qt/menus.cpp \ gui/qt/menus.hpp gui/qt/main_interface.cpp \ gui/qt/main_interface.hpp gui/qt/dialogs_provider.cpp \ @@ -11412,7 +11434,7 @@ gui/qt/util/qvlcapp.hpp gui/qt/util/singleton.hpp \ gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp \ gui/qt/styles/seekstyle.cpp gui/qt/styles/seekstyle.hpp \ - $(am__append_134) + $(am__append_137) # Meta-object compilation moc_verbose = $(moc_verbose_$(V)) @@ -11474,7 +11496,7 @@ gui/qt/util/buttons/RoundButton.moc.cpp \ gui/qt/util/buttons/DeckButtonsLayout.moc.cpp \ gui/qt/util/buttons/BrowseButton.moc.cpp \ - gui/qt/styles/seekstyle.moc.cpp $(am__append_135) \ + gui/qt/styles/seekstyle.moc.cpp $(am__append_138) \ gui/qt/ui/equalizer.h gui/qt/ui/video_effects.h \ gui/qt/ui/open_file.h gui/qt/ui/open_disk.h \ gui/qt/ui/open_net.h gui/qt/ui/open_capture.h gui/qt/ui/open.h \ @@ -11485,7 +11507,7 @@ gui/qt/ui/streampanel.h gui/qt/ui/messages_panel.h \ gui/qt/ui/about.h gui/qt/ui/update.h \ gui/qt/ui/fingerprintdialog.h gui/qt/ui/sout.h \ - gui/qt/resources.cpp $(am__append_138) + gui/qt/resources.cpp $(am__append_141) # User interface compilation uic_verbose = $(uic_verbose_$(V)) @@ -11494,8 +11516,8 @@ uic_verbose__0 = $(uic_verbose_0) MOC_CPPFLAGS = $(DEFS) -I$(top_srcdir)/include \ -I$(top_builddir)/include -I$(top_builddir) \ - $(libqt_plugin_la_CPPFLAGS) $(am__append_136) \ - $(am__append_137) + $(libqt_plugin_la_CPPFLAGS) $(am__append_139) \ + $(am__append_140) libqt_plugin_la_UI = \ gui/qt/ui/equalizer.ui \ gui/qt/ui/video_effects.ui \ @@ -11795,8 +11817,8 @@ gui/skins2/vars/equalizer.hpp gui/skins2/vars/playtree.cpp \ gui/skins2/vars/playtree.hpp gui/skins2/vars/time.cpp \ gui/skins2/vars/time.hpp gui/skins2/vars/volume.cpp \ - gui/skins2/vars/volume.hpp $(am__append_141) $(am__append_142) \ - $(am__append_143) + gui/skins2/vars/volume.hpp $(am__append_144) $(am__append_145) \ + $(am__append_146) libskins2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_skins2) libskins2_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -O2 -fno-rtti libskins2_plugin_la_LIBADD = $(LIBS_skins2) @@ -11819,7 +11841,7 @@ libdirect3d11_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(d3d11dir)' libdirect3d11_filters_plugin_la_LIBADD = libchroma_copy.la \ - libdeinterlace_common.la libd3d11_common.la $(am__append_146) + libdeinterlace_common.la libd3d11_common.la $(am__append_149) d3d11_LTLIBRARIES = $(LTLIBdirect3d11_filters) vaapidir = $(pluginsdir)/vaapi libvaapi_filters_plugin_la_SOURCES = hw/vaapi/filters.c hw/vaapi/filters.h \ @@ -11869,18 +11891,18 @@ @HAVE_VDPAU_TRUE@vdpau_LTLIBRARIES = libvdpau_deinterlace_plugin.la \ @HAVE_VDPAU_TRUE@ libvdpau_adjust_plugin.la \ @HAVE_VDPAU_TRUE@ libvdpau_sharpen_plugin.la \ -@HAVE_VDPAU_TRUE@ libvdpau_chroma_plugin.la $(am__append_148) \ -@HAVE_VDPAU_TRUE@ $(am__append_149) +@HAVE_VDPAU_TRUE@ libvdpau_chroma_plugin.la $(am__append_151) \ +@HAVE_VDPAU_TRUE@ $(am__append_152) keystoredir = $(pluginsdir)/keystore libmemory_keystore_plugin_la_SOURCES = keystore/memory.c \ keystore/list_util.c keystore/list_util.h keystore_LTLIBRARIES = libmemory_keystore_plugin.la \ - libfile_keystore_plugin.la $(am__append_152) $(LTLIBsecret) \ + libfile_keystore_plugin.la $(am__append_155) $(LTLIBsecret) \ $(LTLIBkwallet) libfile_keystore_plugin_la_SOURCES = keystore/file.c \ keystore/file_crypt.h keystore/list_util.c \ - keystore/list_util.h $(am__append_150) $(am__append_151) + keystore/list_util.h $(am__append_153) $(am__append_154) @HAVE_WIN32_TRUE@libfile_keystore_plugin_la_LIBADD = -lcrypt32 libsecret_plugin_la_SOURCES = keystore/secret.c libsecret_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SECRET_CFLAGS) @@ -11897,8 +11919,8 @@ libconsole_logger_plugin_la_SOURCES = logger/console.c libfile_logger_plugin_la_SOURCES = logger/file.c logger_LTLIBRARIES = libconsole_logger_plugin.la \ - libfile_logger_plugin.la $(am__append_153) $(am__append_154) \ - $(am__append_155) + libfile_logger_plugin.la $(am__append_156) $(am__append_157) \ + $(am__append_158) libsyslog_plugin_la_SOURCES = logger/syslog.c libsd_journal_plugin_la_SOURCES = logger/journal.c libsd_journal_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SYSTEMD_CFLAGS) @@ -11919,7 +11941,7 @@ lua/libs/strings.c lua/libs/variables.c lua/libs/variables.h \ lua/libs/video.c lua/libs/vlm.c lua/libs/volume.c \ lua/libs/xml.c lua/libs/io.c lua/libs/errno.c \ - $(am__append_156) + $(am__append_159) liblua_plugin_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) -I$(srcdir)/lua liblua_plugin_la_LIBADD = $(LUA_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM) $(LIBPTHREAD) @BUILD_LUA_TRUE@lua_LTLIBRARIES = liblua_plugin.la @@ -11937,9 +11959,9 @@ libstats_plugin_la_SOURCES = misc/stats.c misc_LTLIBRARIES = liblogger_plugin.la libstats_plugin.la \ libaudioscrobbler_plugin.la libexport_plugin.la \ - libfingerprinter_plugin.la $(LTLIBgnutls) $(am__append_159) \ - $(am__append_160) $(am__append_161) $(am__append_162) \ - $(am__append_163) $(LTLIBxml) + libfingerprinter_plugin.la $(LTLIBgnutls) $(am__append_162) \ + $(am__append_163) $(am__append_164) $(am__append_165) \ + $(am__append_166) $(LTLIBxml) libaudioscrobbler_plugin_la_SOURCES = misc/audioscrobbler.c libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD) libexport_plugin_la_SOURCES = \ @@ -11958,9 +11980,9 @@ libfingerprinter_plugin_la_LIBADD = $(LIBM) $(LIBPTHREAD) libgnutls_plugin_la_SOURCES = misc/gnutls.c libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS) -libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS) $(am__append_157) +libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS) $(am__append_160) libgnutls_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)' \ - $(am__append_158) + $(am__append_161) @HAVE_DARWIN_TRUE@libsecuretransport_plugin_la_SOURCES = misc/securetransport.c @HAVE_DARWIN_TRUE@libsecuretransport_plugin_la_CFLAGS = $(AM_CFLAGS) $(SECURETRANSPORT_CFLAGS) @HAVE_DARWIN_TRUE@libsecuretransport_plugin_la_LIBADD = $(SECURETRANSPORT_LIBS) @@ -12042,13 +12064,13 @@ libpacketizer_dirac_plugin.la libpacketizer_flac_plugin.la \ libpacketizer_hevc_plugin.la libpacketizer_copy_plugin.la \ libpacketizer_a52_plugin.la libpacketizer_dts_plugin.la \ - $(NULL) $(am__append_164) + $(NULL) $(am__append_167) sddir = $(pluginsdir)/services_discovery sd_LTLIBRARIES = libmediadirs_plugin.la libpodcast_plugin.la \ libsap_plugin.la $(LTLIBavahi) $(LTLIBmtp) $(LTLIBupnp) \ - $(am__append_166) $(LTLIBudev) $(am__append_169) \ - $(am__append_170) $(am__append_171) $(LTLIBmicrodns) \ - $(am__append_173) + $(am__append_169) $(LTLIBudev) $(am__append_172) \ + $(am__append_173) $(am__append_174) $(LTLIBmicrodns) \ + $(am__append_176) libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c libpodcast_plugin_la_SOURCES = services_discovery/podcast.c libpodcast_plugin_la_LIBADD = $(LIBPTHREAD) @@ -12066,15 +12088,15 @@ libupnp_plugin_la_SOURCES = services_discovery/upnp.cpp services_discovery/upnp.hpp libupnp_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(UPNP_CFLAGS) libupnp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)' \ - $(am__append_165) + $(am__append_168) libupnp_plugin_la_LIBADD = $(UPNP_LIBS) libpulselist_plugin_la_SOURCES = services_discovery/pulse.c libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS) libpulselist_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS) libudev_plugin_la_SOURCES = services_discovery/udev.c libudev_plugin_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS) \ - $(am__append_167) -libudev_plugin_la_LIBADD = $(UDEV_LIBS) $(am__append_168) + $(am__append_170) +libudev_plugin_la_LIBADD = $(UDEV_LIBS) $(am__append_171) libudev_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)' libxcb_apps_plugin_la_SOURCES = services_discovery/xcb_apps.c libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) @@ -12084,7 +12106,7 @@ libmicrodns_plugin_la_SOURCES = services_discovery/microdns.c libmicrodns_plugin_la_CFLAGS = $(AM_CFLAGS) $(MICRODNS_CFLAGS) libmicrodns_plugin_la_LIBADD = $(SOCKET_LIBS) $(MICRODNS_LIBS) \ - $(am__append_172) + $(am__append_175) libmicrodns_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)' libbonjour_plugin_la_SOURCES = services_discovery/bonjour.m libbonjour_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc @@ -12095,7 +12117,7 @@ libsubsdelay_plugin_la_SOURCES = spu/subsdelay.c spu_LTLIBRARIES = libsubsdelay_plugin.la libaudiobargraph_v_plugin.la \ liblogo_plugin.la libmarq_plugin.la libmosaic_plugin.la \ - librss_plugin.la $(am__append_174) $(am__append_175) + librss_plugin.la $(am__append_177) $(am__append_178) # sub sources libaudiobargraph_v_plugin_la_SOURCES = spu/audiobargraph_v.c @@ -12117,8 +12139,8 @@ libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(SOCKET_LIBS) $(LIBPTHREAD) stream_filterdir = $(pluginsdir)/stream_filter stream_filter_LTLIBRARIES = libcache_read_plugin.la \ - libcache_block_plugin.la $(am__append_176) $(am__append_177) \ - $(am__append_178) libhds_plugin.la librecord_plugin.la \ + libcache_block_plugin.la $(am__append_179) $(am__append_180) \ + $(am__append_181) libhds_plugin.la librecord_plugin.la \ $(LTLIBaribcam) libadf_plugin.la libskiptags_plugin.la libcache_read_plugin_la_SOURCES = stream_filter/cache_read.c libcache_block_plugin_la_SOURCES = stream_filter/cache_block.c @@ -12149,24 +12171,24 @@ libarchive_plugin_la_LIBADD = $(ARCHIVE_LIBS) textdir = $(pluginsdir)/text_renderer libtdummy_plugin_la_SOURCES = text_renderer/tdummy.c -text_LTLIBRARIES = libtdummy_plugin.la $(am__append_193) $(LTLIBsvg) \ - $(am__append_194) $(am__append_195) +text_LTLIBRARIES = libtdummy_plugin.la $(am__append_196) $(LTLIBsvg) \ + $(am__append_197) $(am__append_198) libfreetype_plugin_la_SOURCES = \ text_renderer/freetype/platform_fonts.c \ text_renderer/freetype/platform_fonts.h \ text_renderer/freetype/freetype.c \ text_renderer/freetype/freetype.h \ text_renderer/freetype/text_layout.c \ - text_renderer/freetype/text_layout.h $(am__append_179) \ - $(am__append_180) $(am__append_183) $(am__append_186) \ - $(am__append_187) + text_renderer/freetype/text_layout.h $(am__append_182) \ + $(am__append_183) $(am__append_186) $(am__append_189) \ + $(am__append_190) libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS) \ - $(am__append_184) $(am__append_189) $(am__append_191) -libfreetype_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) $(am__append_181) \ - $(am__append_182) $(am__append_185) $(am__append_190) \ - $(am__append_192) $(FREETYPE_LIBS) + $(am__append_187) $(am__append_192) $(am__append_194) +libfreetype_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) $(am__append_184) \ + $(am__append_185) $(am__append_188) $(am__append_193) \ + $(am__append_195) $(FREETYPE_LIBS) libfreetype_plugin_la_LDFLAGS = $(FREETYPE_LDFLAGS) -rpath \ - '$(textdir)' $(am__append_188) + '$(textdir)' $(am__append_191) @HAVE_WIN32_FALSE@libfreetype_plugin_la_LINK = $(LINK) \ @HAVE_WIN32_FALSE@ $(libfreetype_plugin_la_LDFLAGS) @HAVE_WIN32_TRUE@libfreetype_plugin_la_LINK = $(CXXLINK) \ @@ -12229,8 +12251,8 @@ libi422_i420_plugin.la libi422_yuy2_plugin.la \ libgrey_yuv_plugin.la libyuy2_i420_plugin.la \ libyuy2_i422_plugin.la librv32_plugin.la libchain_plugin.la \ - libyuvp_plugin.la $(LTLIBswscale) $(am__append_196) \ - $(am__append_197) $(am__append_198) $(LTLIBcvpx) + libyuvp_plugin.la $(LTLIBswscale) $(am__append_199) \ + $(am__append_200) $(am__append_201) $(LTLIBcvpx) # AltiVec libi420_yuy2_altivec_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h @@ -12334,7 +12356,7 @@ librotate_plugin_la_SOURCES = video_filter/rotate.c librotate_plugin_la_LIBADD = libvlc_motion.la $(LIBM) librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath \ - '$(video_filterdir)' $(am__append_201) + '$(video_filterdir)' $(am__append_204) libscale_plugin_la_SOURCES = video_filter/scale.c libscene_plugin_la_SOURCES = video_filter/scene.c libscene_plugin_la_LIBADD = $(LIBM) @@ -12360,14 +12382,15 @@ libantiflicker_plugin.la libhqdn3d_plugin.la \ libanaglyph_plugin.la liboldmovie_plugin.la libvhs_plugin.la \ libfps_plugin.la libfreeze_plugin.la libpuzzle_plugin.la \ - librotate_plugin.la $(am__append_202) $(am__append_203) \ + librotate_plugin.la $(am__append_205) $(am__append_206) \ libdeinterlace_plugin.la $(LTLIBopencv_wrapper) \ $(LTLIBpostproc) libblend_plugin.la $(LTLIBopencv_example) # macOS / iOS hardware video filters libci_filters_plugin_la_SOURCES = video_filter/ci_filters.m codec/vt_utils.c codec/vt_utils.h -@HAVE_OSX_TRUE@libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \ -@HAVE_OSX_TRUE@ -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage -Wl,-framework,CoreVideo +libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' \ + -Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage \ + -Wl,-framework,CoreVideo libdeinterlace_common_la_SOURCES = video_filter/deinterlace/common.c video_filter/deinterlace/common.h libdeinterlace_common_la_LDFLAGS = -static @@ -12390,11 +12413,11 @@ video_filter/deinterlace/algo_phosphor.c \ video_filter/deinterlace/algo_phosphor.h \ video_filter/deinterlace/algo_ivtc.c \ - video_filter/deinterlace/algo_ivtc.h $(am__append_204) \ - $(am__append_206) + video_filter/deinterlace/algo_ivtc.h $(am__append_207) \ + $(am__append_209) # inline ASM doesn't build with -O0 -libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2 $(am__append_205) \ - $(am__append_207) $(am__append_208) +libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2 $(am__append_208) \ + $(am__append_210) $(am__append_211) libdeinterlace_plugin_la_LIBADD = libdeinterlace_common.la libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS) @@ -12413,24 +12436,25 @@ libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' splitterdir = $(pluginsdir)/video_splitter splitter_LTLIBRARIES = libclone_plugin.la libwall_plugin.la \ - $(am__append_209) $(am__append_212) + $(am__append_212) $(am__append_215) libclone_plugin_la_SOURCES = video_splitter/clone.c libwall_plugin_la_SOURCES = video_splitter/wall.c libpanoramix_plugin_la_SOURCES = video_splitter/panoramix.c -libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS) $(am__append_210) -libpanoramix_plugin_la_LIBADD = $(LIBM) $(am__append_211) +libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS) $(am__append_213) +libpanoramix_plugin_la_LIBADD = $(LIBM) $(am__append_214) voutdir = $(pluginsdir)/video_output -vout_LTLIBRARIES = $(am__append_213) $(am__append_216) \ - $(am__append_217) $(am__append_218) $(LTLIBgles2) \ - $(am__append_221) $(am__append_222) $(am__append_223) \ - $(am__append_224) $(am__append_225) $(am__append_227) \ - $(am__append_229) $(am__append_230) $(am__append_231) \ - $(am__append_233) $(am__append_234) $(am__append_235) \ - $(LTLIBdirect3d11) $(am__append_240) $(am__append_242) \ - $(am__append_243) $(am__append_244) $(am__append_245) \ - $(am__append_246) $(am__append_247) $(LTLIBfb) $(LTLIBaa) \ - $(LTLIBcaca) $(am__append_250) libflaschen_plugin.la \ - libvdummy_plugin.la libvmem_plugin.la libyuv_plugin.la +vout_LTLIBRARIES = $(am__append_216) $(am__append_217) \ + $(am__append_220) $(am__append_221) $(LTLIBgles2) \ + $(am__append_224) $(am__append_225) $(am__append_226) \ + $(am__append_227) $(am__append_228) $(am__append_230) \ + $(am__append_232) $(am__append_233) $(am__append_234) \ + $(am__append_236) $(am__append_237) $(am__append_238) \ + $(am__append_240) $(LTLIBdirect3d11) $(am__append_244) \ + $(am__append_246) $(am__append_247) $(am__append_248) \ + $(am__append_249) $(am__append_250) $(am__append_251) \ + $(LTLIBfb) $(LTLIBaa) $(LTLIBcaca) $(am__append_254) \ + libflaschen_plugin.la libvdummy_plugin.la libvmem_plugin.la \ + libyuv_plugin.la OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \ video_output/opengl/vout_helper.h video_output/opengl/converter.h \ video_output/opengl/internal.h video_output/opengl/fragment_shaders.c \ @@ -12443,9 +12467,12 @@ @HAVE_DECKLINK_TRUE@libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) -lpthread libglconv_cvpx_plugin_la_SOURCES = \ video_output/opengl/converter_cvpx.c \ - video_output/opengl/converter.h $(am__append_214) + video_output/opengl/converter.h codec/vt_utils.c \ + codec/vt_utils.h libglconv_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ - $(am__append_215) + -Wl,-framework,IOSurface \ + -Wl,-framework,Foundation,-framework,CoreVideo \ + $(am__append_218) $(am__append_219) @HAVE_OSX_TRUE@libvout_macosx_plugin_la_SOURCES = video_output/macosx.m $(OPENGL_COMMONSOURCES) @HAVE_OSX_TRUE@libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DHAVE_GL_CORE_SYMBOLS @HAVE_OSX_TRUE@libvout_macosx_plugin_la_LIBADD = $(OPENGL_COMMONLIBS) @@ -12458,12 +12485,14 @@ @HAVE_OSX_TRUE@libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ @HAVE_OSX_TRUE@ -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore -@HAVE_IOS_TRUE@libglconv_cvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2 +@HAVE_OSX_FALSE@libglconv_cvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2 +@HAVE_OSX_TRUE@libglconv_cvpx_plugin_la_CFLAGS = $(AM_CFLAGS) libvout_ios_plugin_la_SOURCES = video_output/ios.m $(OPENGL_COMMONSOURCES) libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DUSE_OPENGL_ES2 libvout_ios_plugin_la_LIBADD = $(OPENGL_COMMONLIBS) libvout_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ - -Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit + -Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit \ + -Wl,-framework,Foundation ### OpenGL ### @@ -12473,9 +12502,9 @@ libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libgl_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) \ - $(OPENGL_COMMONCLFAGS) $(am__append_219) + $(OPENGL_COMMONCLFAGS) $(am__append_222) libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS) \ - $(am__append_220) + $(am__append_223) libglconv_vaapi_wl_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \ video_output/opengl/converter.h \ hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h @@ -12538,7 +12567,7 @@ libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_xcb_window) \ $(XPROTO_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS) \ - $(am__append_228) + $(am__append_231) libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) $(XCB_KEYSYMS_LIBS) libegl_x11_plugin_la_SOURCES = video_output/opengl/egl.c libegl_x11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_X11=1 @@ -12592,17 +12621,24 @@ libdirect3d9_plugin_la_LIBADD = libchroma_copy.la libd3d9_common.la -lgdi32 $(LIBCOM) -luuid libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' +libglinterop_dxva2_plugin_la_SOURCES = video_output/opengl/interop_dxva2.c \ + video_output/opengl/converter.h + +libglinterop_dxva2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) +libglinterop_dxva2_plugin_la_LIBADD = libchroma_copy.la libd3d9_common.la libdirect3d11_plugin_la_SOURCES = video_output/win32/direct3d11.c \ video_output/win32/d3d11_quad.c \ video_output/win32/d3d11_quad.h \ video_output/win32/d3d11_shaders.c \ video_output/win32/d3d11_shaders.h video_output/win32/common.c \ - video_output/win32/common.h $(am__append_237) + video_output/win32/common.h \ + video_output/win32/d3d11_scaler.cpp \ + video_output/win32/d3d11_scaler.h $(am__append_241) libdirect3d11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_direct3d11 libdirect3d11_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la \ - $(LIBCOM) -luuid $(am__append_238) $(am__append_239) + $(LIBCOM) -luuid $(am__append_242) $(am__append_243) libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirectdraw_plugin_la_SOURCES = video_output/win32/directdraw.c \ video_output/win32/common.c video_output/win32/common.h \ @@ -12674,14 +12710,14 @@ ### ASCII Art ### libaa_plugin_la_SOURCES = video_output/aa.c -libaa_plugin_la_LIBADD = libevent_thread.la -laa $(am__append_248) +libaa_plugin_la_LIBADD = libevent_thread.la -laa $(am__append_252) libaa_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' ### Coloured ASCII art ### libcaca_plugin_la_SOURCES = video_output/caca.c libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS) libcaca_plugin_la_LIBADD = libevent_thread.la $(CACA_LIBS) \ - $(am__append_249) + $(am__append_253) libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' ### EFL Evas video output ### @@ -12701,7 +12737,7 @@ libevent_thread_la_LDFLAGS = -static visudir = $(pluginsdir)/visualization -visu_LTLIBRARIES = $(am__append_251) $(LTLIBgoom) $(LTLIBprojectm) \ +visu_LTLIBRARIES = $(am__append_255) $(LTLIBgoom) $(LTLIBprojectm) \ libvisual_plugin.la $(LTLIBvsxu) libglspectrum_plugin_la_SOURCES = \ visualization/glspectrum.c \ @@ -12742,7 +12778,7 @@ @ENABLE_SOUT_TRUE@ libaccess_output_file_plugin.la \ @ENABLE_SOUT_TRUE@ libaccess_output_http_plugin.la \ @ENABLE_SOUT_TRUE@ libaccess_output_udp_plugin.la \ -@ENABLE_SOUT_TRUE@ $(am__append_252) \ +@ENABLE_SOUT_TRUE@ $(am__append_256) \ @ENABLE_SOUT_TRUE@ $(LTLIBaccess_output_shout) \ @ENABLE_SOUT_TRUE@ $(LTLIBaccess_output_srt) \ @ENABLE_SOUT_TRUE@ libaccess_output_rist_plugin.la @@ -12786,7 +12822,7 @@ @ENABLE_SOUT_TRUE@ libmux_asf_plugin.la libmux_avi_plugin.la \ @ENABLE_SOUT_TRUE@ libmux_mp4_plugin.la libmux_mpjpeg_plugin.la \ @ENABLE_SOUT_TRUE@ libmux_ps_plugin.la libmux_wav_plugin.la \ -@ENABLE_SOUT_TRUE@ $(LTLIBmux_ogg) $(am__append_254) +@ENABLE_SOUT_TRUE@ $(LTLIBmux_ogg) $(am__append_258) @ENABLE_SOUT_TRUE@libmux_ogg_plugin_la_SOURCES = mux/ogg.c @ENABLE_SOUT_TRUE@libmux_ogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OGG_CFLAGS) @ENABLE_SOUT_TRUE@libmux_ogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(muxdir)' @@ -12849,15 +12885,15 @@ @ENABLE_SOUT_TRUE@ libstream_out_transcode_plugin.la \ @ENABLE_SOUT_TRUE@ libstream_out_rtp_plugin.la \ @ENABLE_SOUT_TRUE@ $(LTLIBstream_out_chromaprint) \ -@ENABLE_SOUT_TRUE@ $(am__append_260) +@ENABLE_SOUT_TRUE@ $(am__append_264) @ENABLE_SOUT_TRUE@libstream_out_rtp_plugin_la_SOURCES = \ @ENABLE_SOUT_TRUE@ stream_out/rtp.c stream_out/rtp.h stream_out/rtpfmt.c \ @ENABLE_SOUT_TRUE@ stream_out/rtcp.c stream_out/rtsp.c stream_out/vod.c @ENABLE_SOUT_TRUE@libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS) \ -@ENABLE_SOUT_TRUE@ $(am__append_255) +@ENABLE_SOUT_TRUE@ $(am__append_259) @ENABLE_SOUT_TRUE@libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS) \ -@ENABLE_SOUT_TRUE@ $(LIBPTHREAD) $(am__append_256) +@ENABLE_SOUT_TRUE@ $(LIBPTHREAD) $(am__append_260) @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@SRTP_CFLAGS = -I$(srcdir)/access/rtp @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@SRTP_LIBS = libvlc_srtp.la @@ -14641,6 +14677,15 @@ codec/avcodec/libavcodec_plugin_la-avcodec.lo: \ codec/avcodec/$(am__dirstamp) \ codec/avcodec/$(DEPDIR)/$(am__dirstamp) +packetizer/$(am__dirstamp): + @$(MKDIR_P) packetizer + @: > packetizer/$(am__dirstamp) +packetizer/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) packetizer/$(DEPDIR) + @: > packetizer/$(DEPDIR)/$(am__dirstamp) +packetizer/libavcodec_plugin_la-av1_obu.lo: \ + packetizer/$(am__dirstamp) \ + packetizer/$(DEPDIR)/$(am__dirstamp) codec/avcodec/libavcodec_plugin_la-encoder.lo: \ codec/avcodec/$(am__dirstamp) \ codec/avcodec/$(DEPDIR)/$(am__dirstamp) @@ -14655,12 +14700,6 @@ demux/avformat/$(DEPDIR)/$(am__dirstamp) access/libavcodec_plugin_la-avio.lo: access/$(am__dirstamp) \ access/$(DEPDIR)/$(am__dirstamp) -packetizer/$(am__dirstamp): - @$(MKDIR_P) packetizer - @: > packetizer/$(am__dirstamp) -packetizer/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) packetizer/$(DEPDIR) - @: > packetizer/$(DEPDIR)/$(am__dirstamp) packetizer/libavcodec_plugin_la-avparser.lo: \ packetizer/$(am__dirstamp) \ packetizer/$(DEPDIR)/$(am__dirstamp) @@ -15158,6 +15197,9 @@ video_output/win32/libdirect3d11_plugin_la-common.lo: \ video_output/win32/$(am__dirstamp) \ video_output/win32/$(DEPDIR)/$(am__dirstamp) +video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo: \ + video_output/win32/$(am__dirstamp) \ + video_output/win32/$(DEPDIR)/$(am__dirstamp) video_output/win32/libdirect3d11_plugin_la-events.lo: \ video_output/win32/$(am__dirstamp) \ video_output/win32/$(DEPDIR)/$(am__dirstamp) @@ -15716,6 +15758,12 @@ libgles2_plugin.la: $(libgles2_plugin_la_OBJECTS) $(libgles2_plugin_la_DEPENDENCIES) $(EXTRA_libgles2_plugin_la_DEPENDENCIES) $(AM_V_CCLD)$(libgles2_plugin_la_LINK) $(libgles2_plugin_la_OBJECTS) $(libgles2_plugin_la_LIBADD) $(LIBS) +video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo: \ + video_output/opengl/$(am__dirstamp) \ + video_output/opengl/$(DEPDIR)/$(am__dirstamp) + +libglinterop_dxva2_plugin.la: $(libglinterop_dxva2_plugin_la_OBJECTS) $(libglinterop_dxva2_plugin_la_DEPENDENCIES) $(EXTRA_libglinterop_dxva2_plugin_la_DEPENDENCIES) + $(AM_V_CCLD)$(libglinterop_dxva2_plugin_la_LINK) $(am_libglinterop_dxva2_plugin_la_rpath) $(libglinterop_dxva2_plugin_la_OBJECTS) $(libglinterop_dxva2_plugin_la_LIBADD) $(LIBS) visualization/$(am__dirstamp): @$(MKDIR_P) visualization @: > visualization/$(am__dirstamp) @@ -21146,6 +21194,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/hxxx_common.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/hxxx_nal.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/hxxx_sei.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/libavcodec_plugin_la-avparser.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/libiomx_plugin_la-h264_nal.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@packetizer/$(DEPDIR)/libiomx_plugin_la-hevc_nal.Plo@am__quote@ # am--include-marker @@ -21378,6 +21427,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libgles2_plugin_la-display.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libgles2_plugin_la-fragment_shaders.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libgles2_plugin_la-vout_helper.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-converter_sw.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-fragment_shaders.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Plo@am__quote@ # am--include-marker @@ -21401,6 +21451,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/inhibit.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-common.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_quad.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_shaders.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-direct3d11.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-events.Plo@am__quote@ # am--include-marker @@ -21806,6 +21857,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavcodec_plugin_la_CFLAGS) $(CFLAGS) -c -o codec/avcodec/libavcodec_plugin_la-avcodec.lo `test -f 'codec/avcodec/avcodec.c' || echo '$(srcdir)/'`codec/avcodec/avcodec.c +packetizer/libavcodec_plugin_la-av1_obu.lo: packetizer/av1_obu.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavcodec_plugin_la_CFLAGS) $(CFLAGS) -MT packetizer/libavcodec_plugin_la-av1_obu.lo -MD -MP -MF packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Tpo -c -o packetizer/libavcodec_plugin_la-av1_obu.lo `test -f 'packetizer/av1_obu.c' || echo '$(srcdir)/'`packetizer/av1_obu.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Tpo packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='packetizer/av1_obu.c' object='packetizer/libavcodec_plugin_la-av1_obu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavcodec_plugin_la_CFLAGS) $(CFLAGS) -c -o packetizer/libavcodec_plugin_la-av1_obu.lo `test -f 'packetizer/av1_obu.c' || echo '$(srcdir)/'`packetizer/av1_obu.c + codec/avcodec/libavcodec_plugin_la-encoder.lo: codec/avcodec/encoder.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavcodec_plugin_la_CFLAGS) $(CFLAGS) -MT codec/avcodec/libavcodec_plugin_la-encoder.lo -MD -MP -MF codec/avcodec/$(DEPDIR)/libavcodec_plugin_la-encoder.Tpo -c -o codec/avcodec/libavcodec_plugin_la-encoder.lo `test -f 'codec/avcodec/encoder.c' || echo '$(srcdir)/'`codec/avcodec/encoder.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) codec/avcodec/$(DEPDIR)/libavcodec_plugin_la-encoder.Tpo codec/avcodec/$(DEPDIR)/libavcodec_plugin_la-encoder.Plo @@ -22569,6 +22627,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgles2_plugin_la_CFLAGS) $(CFLAGS) -c -o video_output/opengl/libgles2_plugin_la-display.lo `test -f 'video_output/opengl/display.c' || echo '$(srcdir)/'`video_output/opengl/display.c +video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo: video_output/opengl/interop_dxva2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglinterop_dxva2_plugin_la_CFLAGS) $(CFLAGS) -MT video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo -MD -MP -MF video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Tpo -c -o video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo `test -f 'video_output/opengl/interop_dxva2.c' || echo '$(srcdir)/'`video_output/opengl/interop_dxva2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Tpo video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='video_output/opengl/interop_dxva2.c' object='video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglinterop_dxva2_plugin_la_CFLAGS) $(CFLAGS) -c -o video_output/opengl/libglinterop_dxva2_plugin_la-interop_dxva2.lo `test -f 'video_output/opengl/interop_dxva2.c' || echo '$(srcdir)/'`video_output/opengl/interop_dxva2.c + video_output/opengl/libglwin32_plugin_la-vout_helper.lo: video_output/opengl/vout_helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libglwin32_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libglwin32_plugin_la_CFLAGS) $(CFLAGS) -MT video_output/opengl/libglwin32_plugin_la-vout_helper.lo -MD -MP -MF video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Tpo -c -o video_output/opengl/libglwin32_plugin_la-vout_helper.lo `test -f 'video_output/opengl/vout_helper.c' || echo '$(srcdir)/'`video_output/opengl/vout_helper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Tpo video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Plo @@ -24735,6 +24800,13 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdemux_chromecast_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stream_out/chromecast/libdemux_chromecast_plugin_la-chromecast_demux.lo `test -f 'stream_out/chromecast/chromecast_demux.cpp' || echo '$(srcdir)/'`stream_out/chromecast/chromecast_demux.cpp +video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo: video_output/win32/d3d11_scaler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdirect3d11_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo -MD -MP -MF video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Tpo -c -o video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo `test -f 'video_output/win32/d3d11_scaler.cpp' || echo '$(srcdir)/'`video_output/win32/d3d11_scaler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Tpo video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='video_output/win32/d3d11_scaler.cpp' object='video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdirect3d11_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo `test -f 'video_output/win32/d3d11_scaler.cpp' || echo '$(srcdir)/'`video_output/win32/d3d11_scaler.cpp + video_output/win32/libdirect3d11_plugin_la-sensors.lo: video_output/win32/sensors.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdirect3d11_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT video_output/win32/libdirect3d11_plugin_la-sensors.lo -MD -MP -MF video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-sensors.Tpo -c -o video_output/win32/libdirect3d11_plugin_la-sensors.lo `test -f 'video_output/win32/sensors.cpp' || echo '$(srcdir)/'`video_output/win32/sensors.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-sensors.Tpo video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-sensors.Plo @@ -30052,6 +30124,7 @@ -rm -f packetizer/$(DEPDIR)/hxxx_common.Plo -rm -f packetizer/$(DEPDIR)/hxxx_nal.Plo -rm -f packetizer/$(DEPDIR)/hxxx_sei.Plo + -rm -f packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Plo -rm -f packetizer/$(DEPDIR)/libavcodec_plugin_la-avparser.Plo -rm -f packetizer/$(DEPDIR)/libiomx_plugin_la-h264_nal.Plo -rm -f packetizer/$(DEPDIR)/libiomx_plugin_la-hevc_nal.Plo @@ -30284,6 +30357,7 @@ -rm -f video_output/opengl/$(DEPDIR)/libgles2_plugin_la-display.Plo -rm -f video_output/opengl/$(DEPDIR)/libgles2_plugin_la-fragment_shaders.Plo -rm -f video_output/opengl/$(DEPDIR)/libgles2_plugin_la-vout_helper.Plo + -rm -f video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Plo -rm -f video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-converter_sw.Plo -rm -f video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-fragment_shaders.Plo -rm -f video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Plo @@ -30307,6 +30381,7 @@ -rm -f video_output/win32/$(DEPDIR)/inhibit.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-common.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_quad.Plo + -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_shaders.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-direct3d11.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-events.Plo @@ -31452,6 +31527,7 @@ -rm -f packetizer/$(DEPDIR)/hxxx_common.Plo -rm -f packetizer/$(DEPDIR)/hxxx_nal.Plo -rm -f packetizer/$(DEPDIR)/hxxx_sei.Plo + -rm -f packetizer/$(DEPDIR)/libavcodec_plugin_la-av1_obu.Plo -rm -f packetizer/$(DEPDIR)/libavcodec_plugin_la-avparser.Plo -rm -f packetizer/$(DEPDIR)/libiomx_plugin_la-h264_nal.Plo -rm -f packetizer/$(DEPDIR)/libiomx_plugin_la-hevc_nal.Plo @@ -31684,6 +31760,7 @@ -rm -f video_output/opengl/$(DEPDIR)/libgles2_plugin_la-display.Plo -rm -f video_output/opengl/$(DEPDIR)/libgles2_plugin_la-fragment_shaders.Plo -rm -f video_output/opengl/$(DEPDIR)/libgles2_plugin_la-vout_helper.Plo + -rm -f video_output/opengl/$(DEPDIR)/libglinterop_dxva2_plugin_la-interop_dxva2.Plo -rm -f video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-converter_sw.Plo -rm -f video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-fragment_shaders.Plo -rm -f video_output/opengl/$(DEPDIR)/libglwin32_plugin_la-vout_helper.Plo @@ -31707,6 +31784,7 @@ -rm -f video_output/win32/$(DEPDIR)/inhibit.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-common.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_quad.Plo + -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_scaler.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-d3d11_shaders.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-direct3d11.Plo -rm -f video_output/win32/$(DEPDIR)/libdirect3d11_plugin_la-events.Plo diff -Nru vlc-3.0.18/modules/access/alsa.c vlc-3.0.20/modules/access/alsa.c --- vlc-3.0.18/modules/access/alsa.c 2017-11-29 23:35:29.000000000 +0000 +++ vlc-3.0.20/modules/access/alsa.c 2023-02-11 09:33:17.000000000 +0000 @@ -128,8 +128,8 @@ es_out_id_t *es; vlc_thread_t thread; - mtime_t start; - mtime_t caching; + vlc_tick_t start; + vlc_tick_t caching; snd_pcm_uframes_t period_size; unsigned rate; }; @@ -179,7 +179,7 @@ /* Read data */ snd_pcm_sframes_t frames, delay; - mtime_t pts; + vlc_tick_t pts; frames = snd_pcm_readi (pcm, block->p_buffer, sys->period_size); pts = mdate (); diff -Nru vlc-3.0.18/modules/access/avcapture.m vlc-3.0.20/modules/access/avcapture.m --- vlc-3.0.18/modules/access/avcapture.m 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/modules/access/avcapture.m 2023-02-11 09:33:17.000000000 +0000 @@ -72,7 +72,7 @@ set_callbacks(Open, Close) vlc_module_end () -static mtime_t vlc_CMTime_to_mtime(CMTime timestamp) +static vlc_tick_t vlc_CMTime_to_mtime(CMTime timestamp) { CMTime scaled = CMTimeConvertScale( timestamp, CLOCK_FREQ, @@ -91,8 +91,8 @@ CVImageBufferRef currentImageBuffer; - mtime_t currentPts; - mtime_t previousPts; + vlc_tick_t currentPts; + vlc_tick_t previousPts; size_t bytesPerRow; long timeScale; @@ -105,9 +105,9 @@ - (int)width; - (int)height; - (void)getVideoDimensions:(CMSampleBufferRef)sampleBuffer; -- (mtime_t)currentPts; +- (vlc_tick_t)currentPts; - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection; -- (mtime_t)copyCurrentFrameToBuffer:(void *)buffer; +- (vlc_tick_t)copyCurrentFrameToBuffer:(void *)buffer; @end @implementation VLCAVDecompressedVideoOutput : AVCaptureVideoDataOutput @@ -170,9 +170,9 @@ } } --(mtime_t)currentPts +-(vlc_tick_t)currentPts { - mtime_t pts; + vlc_tick_t pts; @synchronized (self) { @@ -207,10 +207,10 @@ } } -- (mtime_t)copyCurrentFrameToBuffer:(void *)buffer +- (vlc_tick_t)copyCurrentFrameToBuffer:(void *)buffer { CVImageBufferRef imageBuffer; - mtime_t pts; + vlc_tick_t pts; void *pixels; @@ -258,7 +258,7 @@ - (VLCAVCaptureDemux*)init:(demux_t *)demux; - (int)demux; -- (mtime_t)pts; +- (vlc_tick_t)pts; - (void)dealloc; @end @@ -339,7 +339,7 @@ return VLC_SUCCESS; case DEMUX_GET_TIME: - *va_arg(args, mtime_t *) = [demux pts]; + *va_arg(args, vlc_tick_t *) = [demux pts]; return VLC_SUCCESS; default: @@ -524,7 +524,7 @@ return 1; } -- (mtime_t)pts +- (vlc_tick_t)pts { return [_output currentPts]; } diff -Nru vlc-3.0.18/modules/access/bluray.c vlc-3.0.20/modules/access/bluray.c --- vlc-3.0.18/modules/access/bluray.c 2020-10-24 19:59:56.000000000 +0000 +++ vlc-3.0.20/modules/access/bluray.c 2023-02-11 09:33:17.000000000 +0000 @@ -193,7 +193,7 @@ bool b_menu; bool b_menu_open; bool b_popup_available; - mtime_t i_still_end_time; + vlc_tick_t i_still_end_time; vlc_mutex_t bdj_overlay_lock; /* used to lock BD-J overlay open/close while overlays are being sent to vout */ @@ -1485,7 +1485,7 @@ static int subpictureUpdaterValidate(subpicture_t *p_subpic, bool b_fmt_src, const video_format_t *p_fmt_src, bool b_fmt_dst, const video_format_t *p_fmt_dst, - mtime_t i_ts) + vlc_tick_t i_ts) { VLC_UNUSED(b_fmt_src); VLC_UNUSED(b_fmt_dst); @@ -1510,7 +1510,7 @@ static void subpictureUpdaterUpdate(subpicture_t *p_subpic, const video_format_t *p_fmt_src, const video_format_t *p_fmt_dst, - mtime_t i_ts) + vlc_tick_t i_ts) { VLC_UNUSED(p_fmt_src); VLC_UNUSED(p_fmt_dst); @@ -1524,7 +1524,7 @@ /* * When this function is called, all p_subpic regions are gone. - * We need to duplicate our regions (stored internaly) to this subpic. + * We need to duplicate our regions (stored internally) to this subpic. */ subpicture_region_t *p_src = p_overlay->p_regions; if (!p_src) { @@ -3048,13 +3048,13 @@ { es_out_id_t *es; bool drop_first; - mtime_t first_dts; + vlc_tick_t first_dts; }; struct escape_esout_sys { es_out_t *dst_out; - mtime_t offset_pcr; + vlc_tick_t offset_pcr; vlc_array_t es_ids; /* escape_es_id */ }; @@ -3116,7 +3116,7 @@ if (esc_id->drop_first) block->i_flags |= BLOCK_FLAG_PREROLL; } - mtime_t offset = esout_sys->offset_pcr - esc_id->first_dts; + vlc_tick_t offset = esout_sys->offset_pcr - esc_id->first_dts; block->i_pts += offset; block->i_dts += offset; } @@ -3157,7 +3157,7 @@ case ES_OUT_SET_GROUP_PCR: { int group = va_arg( args, int ); - mtime_t pcr = va_arg( args, int64_t ); + vlc_tick_t pcr = va_arg( args, int64_t ); if (esout_sys->offset_pcr == -1) esout_sys->offset_pcr = pcr; diff -Nru vlc-3.0.18/modules/access/cdda.c vlc-3.0.20/modules/access/cdda.c --- vlc-3.0.18/modules/access/cdda.c 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/modules/access/cdda.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * cdda.c : CD digital audio input module for vlc ***************************************************************************** * Copyright (C) 2000, 2003-2006, 2008-2009 VLC authors and VideoLAN - * $Id: b8839c0839512bc9396e683ca2a024ba1249853c $ + * $Id: 794c550e5a341bb002ecf58285b90ed8371f2ff8 $ * * Authors: Laurent Aimar * Gildas Bazin @@ -171,11 +171,11 @@ sys->position += count; block->i_nb_samples = block->i_buffer / 4; - block->i_dts = block->i_pts = VLC_TS_0 + date_Get(&sys->pts); + block->i_dts = block->i_pts = VLC_TICK_0 + date_Get(&sys->pts); date_Increment(&sys->pts, block->i_nb_samples); es_out_Send(demux->out, sys->es, block); - es_out_SetPCR(demux->out, VLC_TS_0 + date_Get(&sys->pts)); + es_out_SetPCR(demux->out, VLC_TICK_0 + date_Get(&sys->pts)); return VLC_DEMUXER_SUCCESS; } @@ -212,10 +212,10 @@ break; case DEMUX_GET_LENGTH: - *va_arg(args, mtime_t *) = (INT64_C(40000) * sys->length) / 3; + *va_arg(args, vlc_tick_t *) = (INT64_C(40000) * sys->length) / 3; break; case DEMUX_GET_TIME: - *va_arg(args, mtime_t *) = (INT64_C(40000) * sys->position) / 3; + *va_arg(args, vlc_tick_t *) = (INT64_C(40000) * sys->position) / 3; break; case DEMUX_SET_TIME: sys->position = (va_arg(args, mtime_t) * 3) / INT64_C(40000); @@ -724,8 +724,8 @@ p_toc->i_last_track > sys->i_cdda_last) i_last_sector -= CD_ROM_XA_INTERVAL; - const mtime_t duration = - (mtime_t)(i_last_sector - i_first_sector) + const vlc_tick_t duration = + (vlc_tick_t)(i_last_sector - i_first_sector) * CDDA_DATA_SIZE * CLOCK_FREQ / 44100 / 2 / 2; input_item_t *item = input_item_NewDisc(access->psz_url, @@ -979,7 +979,7 @@ } /***************************************************************************** - * Module descriptior + * Module descriptor *****************************************************************************/ #define CDAUDIO_DEV_TEXT N_("Audio CD device") #if defined( _WIN32 ) || defined( __OS2__ ) diff -Nru vlc-3.0.18/modules/access/dcp/dcp.cpp vlc-3.0.20/modules/access/dcp/dcp.cpp --- vlc-3.0.18/modules/access/dcp/dcp.cpp 2021-06-13 09:32:34.000000000 +0000 +++ vlc-3.0.20/modules/access/dcp/dcp.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -162,7 +162,7 @@ uint8_t pi_chan_table[AOUT_CHAN_MAX]; uint8_t i_channels; - mtime_t i_pts; + vlc_tick_t i_pts; demux_sys_t(): PictureEssType ( ESS_UNKNOWN ), @@ -609,7 +609,7 @@ PCM::FrameBuffer AudioFrameBuff( p_sys->i_audio_buffer); AESDecContext video_aes_ctx, audio_aes_ctx; - /* swaping video reels */ + /* swapping video reels */ if ( p_sys->frame_no == p_sys->p_dcp->video_reels[p_sys->i_video_reel].i_absolute_end ) { if ( p_sys->i_video_reel + 1 == p_sys->v_videoReader.size() ) @@ -622,7 +622,7 @@ } } - /* swaping audio reels */ + /* swapping audio reels */ if ( !p_sys->p_dcp->audio_reels.empty() && p_sys->frame_no == p_sys->p_dcp->audio_reels[p_sys->i_audio_reel].i_absolute_end ) { if ( p_sys->i_audio_reel + 1 == p_sys->v_audioReader.size() ) @@ -826,7 +826,7 @@ p_sys->frame_no = i64 * p_sys->frame_rate_num / ( CLOCK_FREQ * p_sys->frame_rate_denom ); p_sys->i_pts= i64; es_out_SetPCR(p_demux->out, p_sys->i_pts); - es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, ( mtime_t ) i64 ); + es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, ( vlc_tick_t ) i64 ); break; case DEMUX_GET_PTS_DELAY: pi64 = va_arg( args, int64_t * ); diff -Nru vlc-3.0.18/modules/access/dcp/dcpparser.cpp vlc-3.0.20/modules/access/dcp/dcpparser.cpp --- vlc-3.0.18/modules/access/dcp/dcpparser.cpp 2017-12-22 19:05:11.000000000 +0000 +++ vlc-3.0.20/modules/access/dcp/dcpparser.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -558,7 +558,7 @@ /* Asset tags not in PKL */ break; default: - msg_Warn(this->p_demux, "Unknow ASSET_TAG: %i", _tag ); + msg_Warn(this->p_demux, "Unknown ASSET_TAG: %i", _tag ); break; } /* break the for loop as a tag is found*/ @@ -919,7 +919,7 @@ this->s_group_id = s_value; break; default: - msg_Warn(this->p_demux, "Unknow PKG_TAG: %i", _tag ); + msg_Warn(this->p_demux, "Unknown PKG_TAG: %i", _tag ); break; } /* break the for loop as a tag is found*/ @@ -1421,7 +1421,7 @@ this->s_content_kind = s_value; break; default: - msg_Warn(this->p_demux, "Unknow CPL_TAG: %i", _tag ); + msg_Warn(this->p_demux, "Unknown CPL_TAG: %i", _tag ); break; } diff -Nru vlc-3.0.18/modules/access/decklink.cpp vlc-3.0.20/modules/access/decklink.cpp --- vlc-3.0.18/modules/access/decklink.cpp 2019-05-13 13:08:00.000000000 +0000 +++ vlc-3.0.20/modules/access/decklink.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -334,7 +334,7 @@ BMDTimeValue stream_time, frame_duration; videoFrame->GetStreamTime(&stream_time, &frame_duration, CLOCK_FREQ); video_frame->i_flags = BLOCK_FLAG_TYPE_I | sys->dominance_flags; - video_frame->i_pts = video_frame->i_dts = VLC_TS_0 + stream_time; + video_frame->i_pts = video_frame->i_dts = VLC_TICK_0 + stream_time; if (sys->video_fmt.i_codec == VLC_CODEC_I422_10L) { v210_convert((uint16_t*)video_frame->p_buffer, frame_bytes, width, height); @@ -349,7 +349,7 @@ block_t *cc = vanc_to_cc(demux_, dec, width * 2); if (!cc) continue; - cc->i_pts = cc->i_dts = VLC_TS_0 + stream_time; + cc->i_pts = cc->i_dts = VLC_TICK_0 + stream_time; if (!sys->cc_es) { es_format_t fmt; @@ -401,7 +401,7 @@ BMDTimeValue packet_time; audioFrame->GetPacketTime(&packet_time, CLOCK_FREQ); - audio_frame->i_pts = audio_frame->i_dts = VLC_TS_0 + packet_time; + audio_frame->i_pts = audio_frame->i_dts = VLC_TICK_0 + packet_time; vlc_mutex_lock(&sys->pts_lock); if (audio_frame->i_pts > sys->last_pts) diff -Nru vlc-3.0.18/modules/access/disc_helper.h vlc-3.0.20/modules/access/disc_helper.h --- vlc-3.0.18/modules/access/disc_helper.h 2020-05-15 10:41:12.000000000 +0000 +++ vlc-3.0.20/modules/access/disc_helper.h 2023-02-11 09:33:17.000000000 +0000 @@ -52,7 +52,7 @@ int retVal = access( psz_file, R_OK ); if( retVal == -1 && errno == EPERM ) { - msg_Err( p_this, "Path %s cannot be opened due to unsufficient permissions", psz_file ); + msg_Err( p_this, "Path %s cannot be opened due to insufficient permissions", psz_file ); vlc_dialog_display_error( p_this, _("Problem accessing a system resource"), _("Potentially, macOS blocks access to your disc. " "Please open \"System Preferences\" -> \"Security & Privacy\" " diff -Nru vlc-3.0.18/modules/access/dshow/access.h vlc-3.0.20/modules/access/dshow/access.h --- vlc-3.0.18/modules/access/dshow/access.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dshow/access.h 2023-02-11 09:33:17.000000000 +0000 @@ -3,7 +3,7 @@ * access_sys_t definition ***************************************************************************** * Copyright (C) 2002, 2004, 2010-2011 VLC authors and VideoLAN - * $Id: 0527423c6b9de54b5edf0b5e3750b96ac509c535 $ + * $Id: fc425eb18bb956fd7f59d277f2625568dbc4ec66 $ * * Author: Gildas Bazin * @@ -75,6 +75,6 @@ int i_width; int i_height; int i_chroma; - mtime_t i_start; + vlc_tick_t i_start; }; diff -Nru vlc-3.0.18/modules/access/dshow/dshow.cpp vlc-3.0.20/modules/access/dshow/dshow.cpp --- vlc-3.0.18/modules/access/dshow/dshow.cpp 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/dshow/dshow.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * dshow.cpp : DirectShow access and access_demux module for vlc ***************************************************************************** * Copyright (C) 2002-2004, 2006, 2008, 2010 the VideoLAN team - * $Id: f22571e183456dcfdd859ff7f53e149067a17cb0 $ + * $Id: 8fd2c95ed623a78651b2d929f5b6922236403630 $ * * Author: Gildas Bazin * Damien Fouilleul @@ -962,7 +962,7 @@ } /* - * get fourcc priority from arbritary preference, the higher the better + * get fourcc priority from arbitrary preference, the higher the better */ static int GetFourCCPriority( int i_fourcc ) { @@ -1075,7 +1075,7 @@ } } - // Retreive acceptable media types supported by device + // Retrieve acceptable media types supported by device AM_MEDIA_TYPE media_types[MAX_MEDIA_TYPES]; size_t media_count = EnumDeviceCaps( p_this, p_device_filter.Get(), b_audio ? 0 : p_sys->i_chroma, @@ -1222,7 +1222,7 @@ /* FindCaptureDevices:: This Function had two purposes : Returns the list of capture devices when p_listdevices != NULL Creates an IBaseFilter when p_devicename corresponds to an existing devname - These actions *may* be requested whith a single call. + These actions *may* be requested with a single call. */ static ComPtr FindCaptureDevice( vlc_object_t *p_this, std::string *p_devicename, @@ -1299,7 +1299,7 @@ { if( 0 == (*iter).compare( devname ) ) { /* devname is on the list. Try another name with sequence - number apended and then rescan until a unique entry is found*/ + number appended and then rescan until a unique entry is found*/ char seq[16]; snprintf(seq, 16, " #%d", ++dup); devname = ordevname + seq; @@ -1883,13 +1883,13 @@ p_stream->b_pts = true; } else - i_pts = VLC_TS_INVALID; + i_pts = VLC_TICK_INVALID; } - if( i_pts > VLC_TS_INVALID ) { + if( i_pts > VLC_TICK_INVALID ) { i_pts += (i_pts >= 0) ? +5 : -4; i_pts /= 10; /* 100-ns to µs conversion */ - i_pts += VLC_TS_0; + i_pts += VLC_TICK_0; } #if 0 msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: %" PRId64, @@ -1900,7 +1900,7 @@ memcpy( p_block->p_buffer, p_data, i_data_size ); p_block->i_pts = p_block->i_dts = i_pts; - if( i_pts > VLC_TS_INVALID ) + if( i_pts > VLC_TICK_INVALID ) es_out_SetPCR( p_demux->out, i_pts ); es_out_Send( p_demux->out, p_stream->p_es, p_block ); diff -Nru vlc-3.0.18/modules/access/dshow/filter.cpp vlc-3.0.20/modules/access/dshow/filter.cpp --- vlc-3.0.18/modules/access/dshow/filter.cpp 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dshow/filter.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * filter.cpp : DirectShow access module for vlc ***************************************************************************** * Copyright (C) 2002-2010 VLC authors and VideoLAN - * $Id: 40620b9c644bc9b3fd0c07a695a97bb1f150bc3f $ + * $Id: bf33cc79db1f795ccadc69de44d5f7d3f9e0d491 $ * * Author: Gildas Bazin * @@ -253,7 +253,7 @@ * Returns a sample from its sample queue. Proper locking must be done prior * to this call. Current dshow code protects the access to any sample queue * (audio and video) with the p_sys->lock - * @param vlc_sample [out] Address of a sample if sucessfull. Undefined + * @param vlc_sample [out] Address of a sample if successful. Undefined * otherwise. * @return S_OK if a sample was available, S_FALSE if no sample was * available @@ -638,7 +638,7 @@ msg_Dbg( p_input, "CapturePin::Receive" ); #endif - mtime_t i_timestamp = mdate() * 10; + vlc_tick_t i_timestamp = mdate() * 10; VLCMediaSample vlc_sample = {pSample, i_timestamp}; vlc_mutex_lock( &p_sys->lock ); diff -Nru vlc-3.0.18/modules/access/dshow/filter.h vlc-3.0.20/modules/access/dshow/filter.h --- vlc-3.0.18/modules/access/dshow/filter.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dshow/filter.h 2023-02-11 09:33:17.000000000 +0000 @@ -3,7 +3,7 @@ * CapturePin, CaptureFilter, CaptureEnumPins implementations ***************************************************************************** * Copyright (C) 2002-2004, 2008 VLC authors and VideoLAN - * $Id: 733f45b7bddd4e2f5c09896d5a8466f9bb5a31fc $ + * $Id: 44c9c425218de2fba2d89c62726b081f61f4e14f $ * * Author: Gildas Bazin * @@ -31,7 +31,7 @@ struct VLCMediaSample { ComPtr p_sample; - mtime_t i_timestamp; + vlc_tick_t i_timestamp; }; /* */ diff -Nru vlc-3.0.18/modules/access/dtv/bdagraph.cpp vlc-3.0.20/modules/access/dtv/bdagraph.cpp --- vlc-3.0.18/modules/access/dtv/bdagraph.cpp 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dtv/bdagraph.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -340,7 +340,7 @@ vlc_mutex_locker l( &lock ); - mtime_t i_deadline = mdate() + ms * 1000; + vlc_tick_t i_deadline = mdate() + ms * 1000; while( !p_first ) { if( vlc_cond_timedwait( &wait, &lock, i_deadline ) ) diff -Nru vlc-3.0.18/modules/access/dtv/en50221.c vlc-3.0.20/modules/access/dtv/en50221.c --- vlc-3.0.18/modules/access/dtv/en50221.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dtv/en50221.c 2023-02-11 09:33:17.000000000 +0000 @@ -120,7 +120,7 @@ vlc_object_t *obj; int fd; int i_ca_type; - mtime_t i_timeout, i_next_event; + vlc_tick_t i_timeout, i_next_event; unsigned i_nb_slots; bool pb_active_slot[MAX_CI_SLOTS]; @@ -1265,11 +1265,11 @@ CAPMTFirst( p_cam, i_session_id, p_info ); return; } - + #ifdef CAPMT_WAIT msleep( CAPMT_WAIT * 1000 ); #endif - + msg_Dbg( p_cam->obj, "adding CAPMT for SID %d on session %d", p_info->i_program_number, i_session_id ); @@ -1404,7 +1404,7 @@ typedef struct { int i_interval; - mtime_t i_last; + vlc_tick_t i_last; } date_time_t; /***************************************************************************** @@ -1488,7 +1488,7 @@ (date_time_t *)p_cam->p_sessions[i_session_id - 1].p_sys; if ( p_date->i_interval - && mdate() > p_date->i_last + (mtime_t)p_date->i_interval * 1000000 ) + && mdate() > p_date->i_last + (vlc_tick_t)p_date->i_interval * 1000000 ) { DateTimeSend( p_cam, i_session_id ); } diff -Nru vlc-3.0.18/modules/access/dvb/access.c vlc-3.0.20/modules/access/dvb/access.c --- vlc-3.0.18/modules/access/dvb/access.c 2017-12-04 00:34:36.000000000 +0000 +++ vlc-3.0.20/modules/access/dvb/access.c 2023-02-11 09:33:17.000000000 +0000 @@ -292,19 +292,19 @@ FrontendGetStatus( &p_sys->dvb, &status ); bool b_has_lock = status.b_has_lock; - mtime_t i_scan_start = mdate(); + vlc_tick_t i_scan_start = mdate(); for( ; *pi_count == 0; ) { /* Find if some data is available */ int i_ret; - mtime_t i_timeout = b_has_lock ? i_probe_timeout: + vlc_tick_t i_timeout = b_has_lock ? i_probe_timeout: DVB_SCAN_MAX_LOCK_TIME; do { - mtime_t i_poll_timeout = i_scan_start - mdate() + i_timeout; + vlc_tick_t i_poll_timeout = i_scan_start - mdate() + i_timeout; i_ret = 0; diff -Nru vlc-3.0.18/modules/access/dvb/linux_dvb.c vlc-3.0.20/modules/access/dvb/linux_dvb.c --- vlc-3.0.18/modules/access/dvb/linux_dvb.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dvb/linux_dvb.c 2023-02-11 09:33:17.000000000 +0000 @@ -409,7 +409,7 @@ /* if frontend can do auto, don't scan them */ p_scan->b_modulation_set = ( p_frontend->info.caps & FE_CAN_QAM_AUTO ); - /* our scanning code flips modulation from 16..256 automaticly*/ + /* our scanning code flips modulation from 16..256 automatically*/ /* if user supplies symbolrate, don't scan those */ p_scan->i_symbolrate = var_GetInteger( p_access, "dvb-srate" ); diff -Nru vlc-3.0.18/modules/access/dvb/scan.c vlc-3.0.20/modules/access/dvb/scan.c --- vlc-3.0.18/modules/access/dvb/scan.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/dvb/scan.c 2023-02-11 09:33:17.000000000 +0000 @@ -88,7 +88,7 @@ char *psz_name; /* channel name in utf8 */ char *psz_provider; /* service provider */ uint16_t i_channel; /* logical channel number */ - bool b_crypted; /* True if potentially crypted */ + bool b_crypted; /* True if potentially encrypted */ char *psz_original_network_name; @@ -563,7 +563,7 @@ static const unsigned short symbolrates[] = { 6900, 6875, 6950 /* With DR_44 we can cover other symbolrates from NIT-info - as all channel-seed files have atleast one channel that + as all channel-seed files have at least one channel that has one of these symbolrate */ }; @@ -654,7 +654,7 @@ const int i_offset_count = 5; const int i_mhz = 1000000; - /* We will probe the whole band divided in all bandwidth possibility trying + /* We will probe the whole band divided in all bandwidth possibility trying * i_offset_count offset around the position */ for( ;; p_spectrum->i_index++ ) @@ -812,7 +812,7 @@ //while( !scan_tuner_config_ParametersValidate( &p_scan->parameter, p_cfg ) ); const size_t i_total_services = scan_CountServices( p_scan ); - const mtime_t i_eta = f_position > 0.005 ? (mdate() - p_scan->i_time_start) * ( 1.0 / f_position - 1.0 ) : -1; + const vlc_tick_t i_eta = f_position > 0.005 ? (mdate() - p_scan->i_time_start) * ( 1.0 / f_position - 1.0 ) : -1; char psz_eta[MSTRTIME_MAX_SIZE]; const char *psz_fmt = _("%.1f MHz (%d services)\n~%s remaining"); @@ -876,7 +876,7 @@ for( ;; ) { unsigned i_timeout = scan_session_GetTablesTimeout( session ); - mtime_t i_remaining = mdate() - i_scan_start; + vlc_tick_t i_remaining = mdate() - i_scan_start; if( i_remaining > i_timeout ) break; diff -Nru vlc-3.0.18/modules/access/dvdnav.c vlc-3.0.20/modules/access/dvdnav.c --- vlc-3.0.18/modules/access/dvdnav.c 2022-05-28 15:58:34.000000000 +0000 +++ vlc-3.0.20/modules/access/dvdnav.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * dvdnav.c: DVD module using the dvdnav library. ***************************************************************************** * Copyright (C) 2004-2009 VLC authors and VideoLAN - * $Id: 965011f26a11810409132fd0708305cca9ce1411 $ + * $Id: a697dc6d9cde6a818b2815350b8ecce39f65844e $ * * Authors: Laurent Aimar * @@ -170,7 +170,7 @@ int cur_seekpoint; /* length of program group chain */ - mtime_t i_pgc_length; + vlc_tick_t i_pgc_length; int i_vobu_index; int i_vobu_flush; }; @@ -612,7 +612,7 @@ case DEMUX_GET_TIME: if( p_sys->i_pgc_length > 0 ) { - *va_arg( args, mtime_t * ) = + *va_arg( args, vlc_tick_t * ) = dvdnav_get_current_time( p_sys->dvdnav ) * 100 / 9; return VLC_SUCCESS; } @@ -620,7 +620,7 @@ case DEMUX_SET_TIME: { - mtime_t i_time = va_arg( args, mtime_t ); + vlc_tick_t i_time = va_arg( args, vlc_tick_t ); if( dvdnav_jump_to_sector_by_time( p_sys->dvdnav, i_time * 9 / 100, SEEK_SET ) == DVDNAV_STATUS_OK ) @@ -898,7 +898,7 @@ if( event->length != 0xff && p_sys->still.b_created ) { - mtime_t delay = event->length * CLOCK_FREQ; + vlc_tick_t delay = event->length * CLOCK_FREQ; vlc_timer_schedule( p_sys->still.timer, false, delay, 0 ); } @@ -989,7 +989,7 @@ if( tk->b_configured ) { es_format_Clean( &tk->fmt ); - if( tk->es ) + if( tk->es ) { es_out_Del( p_demux->out, tk->es ); tk->es = NULL; @@ -1460,7 +1460,7 @@ tk->i_next_block_flags = 0; if( i_next_block_flags & BLOCK_FLAG_CELL_DISCONTINUITY ) { - if( p_pkt->i_dts >= VLC_TS_INVALID ) + if( p_pkt->i_dts >= VLC_TICK_INVALID ) { i_next_block_flags &= ~BLOCK_FLAG_CELL_DISCONTINUITY; i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; diff -Nru vlc-3.0.18/modules/access/dvdread.c vlc-3.0.20/modules/access/dvdread.c --- vlc-3.0.18/modules/access/dvdread.c 2021-06-09 15:27:37.000000000 +0000 +++ vlc-3.0.20/modules/access/dvdread.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * dvdread.c : DvdRead input module for vlc ***************************************************************************** * Copyright (C) 2001-2006 VLC authors and VideoLAN - * $Id: 749cbd47e00a1da57c4277187a9fcab03a217867 $ + * $Id: 37ad0d51b2f142b799479af655593270604f13e6 $ * * Authors: Stéphane Borel * Gildas Bazin @@ -129,14 +129,14 @@ int i_title_end_block; int i_title_blocks; int i_title_offset; - mtime_t i_title_cur_time; + vlc_tick_t i_title_cur_time; int i_title_start_cell; int i_title_end_cell; int i_cur_cell; int i_next_cell; - mtime_t i_cell_cur_time; - mtime_t i_cell_duration; + vlc_tick_t i_cell_cur_time; + vlc_tick_t i_cell_duration; /* Track */ ps_track_t tk[PS_TK_COUNT]; @@ -265,9 +265,9 @@ ps_track_init( p_sys->tk ); p_sys->i_sar_num = 0; p_sys->i_sar_den = 0; - p_sys->i_title_cur_time = (mtime_t) 0; - p_sys->i_cell_cur_time = (mtime_t) 0; - p_sys->i_cell_duration = (mtime_t) 0; + p_sys->i_title_cur_time = (vlc_tick_t) 0; + p_sys->i_cell_cur_time = (vlc_tick_t) 0; + p_sys->i_cell_duration = (vlc_tick_t) 0; p_sys->p_dvdread = p_dvdread; p_sys->p_vmg_file = p_vmg_file; @@ -643,7 +643,7 @@ int i_mux_rate; if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) ) { - es_out_SetPCR( p_demux->out, VLC_TS_0 + i_scr ); + es_out_SetPCR( p_demux->out, VLC_TICK_0 + i_scr ); if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate; } block_Release( p_pkt ); @@ -1222,8 +1222,8 @@ /* * Store the timecodes so we can get the current time */ - p_sys->i_title_cur_time = (mtime_t) p_sys->dsi_pack.dsi_gi.nv_pck_scr / 90 * 1000; - p_sys->i_cell_cur_time = (mtime_t) dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ); + p_sys->i_title_cur_time = (vlc_tick_t) p_sys->dsi_pack.dsi_gi.nv_pck_scr / 90 * 1000; + p_sys->i_cell_cur_time = (vlc_tick_t) dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ); /* * Determine where we go next. These values are the ones we mostly @@ -1307,7 +1307,7 @@ p_sys->i_next_vobu = p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].first_sector; - p_sys->i_cell_duration = (mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ); + p_sys->i_cell_duration = (vlc_tick_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ); } @@ -1321,7 +1321,7 @@ dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ) ); msg_Dbg( p_demux, "cell duration: %lld", - (mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ) ); + (vlc_tick_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ) ); msg_Dbg( p_demux, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d", p_sys->dsi_pack.sml_pbi.category, diff -Nru vlc-3.0.18/modules/access/http/hpackenc.c vlc-3.0.20/modules/access/http/hpackenc.c --- vlc-3.0.18/modules/access/http/hpackenc.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/http/hpackenc.c 2023-01-01 22:21:52.000000000 +0000 @@ -33,7 +33,7 @@ #include "hpack.h" /* - * This is curently the simplest possible HPACK compressor: it does not + * This is currently the simplest possible HPACK compressor: it does not * compress anything and is stateless. * TODO: * - use static Huffman compression when useful, diff -Nru vlc-3.0.18/modules/access/http/message.h vlc-3.0.20/modules/access/http/message.h --- vlc-3.0.18/modules/access/http/message.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/http/message.h 2023-02-11 09:33:17.000000000 +0000 @@ -219,7 +219,7 @@ /** * Looks up a token in a header field. * - * Finds the first occurence of a token within a HTTP field header. + * Finds the first occurrence of a token within a HTTP field header. * * @param field HTTP header field name * @param token HTTP token name diff -Nru vlc-3.0.18/modules/access/idummy.c vlc-3.0.20/modules/access/idummy.c --- vlc-3.0.18/modules/access/idummy.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/idummy.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * idummy.c: dummy input plugin, to manage "vlc://" special options ***************************************************************************** * Copyright (C) 2001, 2002 VLC authors and VideoLAN - * $Id: 6721df04c7c5b0dd34bb02988011bf33ba157ed7 $ + * $Id: 5251569a3304757366799ef88be4e761f78af46d $ * * Authors: Samuel Hocevar * @@ -62,14 +62,14 @@ struct demux_sys_t { - mtime_t end; - mtime_t length; + vlc_tick_t end; + vlc_tick_t length; }; static int DemuxPause( demux_t *demux ) { demux_sys_t *p_sys = demux->p_sys; - mtime_t now = mdate(); + vlc_tick_t now = mdate(); if( now >= p_sys->end ) return 0; @@ -88,7 +88,7 @@ { double *ppos = va_arg( args, double * ); double pos; - mtime_t now = mdate(); + vlc_tick_t now = mdate(); pos = 1. + ((double)(now - p_sys->end) / (double)p_sys->length); *ppos = (pos <= 1.) ? pos : 1.; @@ -98,7 +98,7 @@ case DEMUX_SET_POSITION: { double pos = va_arg( args, double ); - mtime_t now = mdate(); + vlc_tick_t now = mdate(); p_sys->end = now + (p_sys->length * (1. - pos)); break; @@ -106,21 +106,21 @@ case DEMUX_GET_LENGTH: { - mtime_t *plen = va_arg( args, mtime_t * ); + vlc_tick_t *plen = va_arg( args, vlc_tick_t * ); *plen = p_sys->length; break; } case DEMUX_GET_TIME: { - mtime_t *ppos = va_arg( args, mtime_t * ); + vlc_tick_t *ppos = va_arg( args, vlc_tick_t * ); *ppos = mdate() + p_sys->length - p_sys->end; break; } case DEMUX_SET_TIME: { - mtime_t pos = va_arg( args, mtime_t ); + vlc_tick_t pos = va_arg( args, vlc_tick_t ); p_sys->end = mdate() + p_sys->length - pos; break; } @@ -178,7 +178,7 @@ if( !strncasecmp( psz_name, "pause:", 6 ) ) { double f = us_atof( psz_name + 6 ); - mtime_t length = f * CLOCK_FREQ; + vlc_tick_t length = f * CLOCK_FREQ; msg_Info( p_demux, "command `pause %f'", f ); if( length == 0 ) diff -Nru vlc-3.0.18/modules/access/imem.c vlc-3.0.20/modules/access/imem.c --- vlc-3.0.18/modules/access/imem.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/imem.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * imem.c : Memory input for VLC ***************************************************************************** * Copyright (C) 2009-2010 Laurent Aimar - * $Id: ba7c1ea1e06f515b0e474b18c6330a44f0c6ded4 $ + * $Id: 1a6da1514cfabcc93415131baada5602bbb34c0a $ * * Author: Laurent Aimar * @@ -38,7 +38,7 @@ #include /***************************************************************************** - * Module descriptior + * Module descriptor *****************************************************************************/ static int OpenAccess (vlc_object_t *); static void CloseAccess(vlc_object_t *); @@ -217,9 +217,9 @@ es_out_id_t *es; - mtime_t dts; + vlc_tick_t dts; - mtime_t deadline; + vlc_tick_t deadline; } imem_sys_t; static void ParseMRL(vlc_object_t *, const char *); @@ -279,7 +279,7 @@ /* */ sys->dts = 0; - sys->deadline = VLC_TS_INVALID; + sys->deadline = VLC_TICK_INVALID; *sys_ptr = sys; return VLC_SUCCESS; @@ -360,7 +360,7 @@ } /** - * It retreives data using the get() callback, copies them, + * It retrieves data using the get() callback, copies them, * and then release them using the release() callback. */ static block_t *Block(stream_t *access, bool *restrict eof) @@ -564,14 +564,14 @@ } /** - * It retreives data using the get() callback, sends them to es_out + * It retrieves data using the get() callback, sends them to es_out * and the release it using the release() callback. */ static int Demux(demux_t *demux) { imem_sys_t *sys = (imem_sys_t*)demux->p_sys; - if (sys->deadline == VLC_TS_INVALID) + if (sys->deadline == VLC_TICK_INVALID) sys->deadline = sys->dts + 1; for (;;) { @@ -594,8 +594,8 @@ if (buffer_size > 0) { block_t *block = block_Alloc(buffer_size); if (block) { - block->i_dts = dts >= 0 ? (1 + dts) : VLC_TS_INVALID; - block->i_pts = pts >= 0 ? (1 + pts) : VLC_TS_INVALID; + block->i_dts = dts >= 0 ? (1 + dts) : VLC_TICK_INVALID; + block->i_pts = pts >= 0 ? (1 + pts) : VLC_TICK_INVALID; memcpy(block->p_buffer, buffer, buffer_size); es_out_SetPCR(demux->out, block->i_dts); @@ -608,7 +608,7 @@ sys->source.release(sys->source.data, sys->source.cookie, buffer_size, buffer); } - sys->deadline = VLC_TS_INVALID; + sys->deadline = VLC_TICK_INVALID; return 1; } diff -Nru vlc-3.0.18/modules/access/jack.c vlc-3.0.20/modules/access/jack.c --- vlc-3.0.18/modules/access/jack.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/jack.c 2023-02-11 09:33:17.000000000 +0000 @@ -176,7 +176,7 @@ } /* allocate ringbuffer */ - /* The length of the ringbuffer is critical, it must be large enought + /* The length of the ringbuffer is critical, it must be large enough to keep all data between 2 GrabJack() calls. We assume 1 sec is ok */ p_sys->p_jack_ringbuffer = jack_ringbuffer_create( p_sys->i_channels * jack_get_sample_rate( p_sys->p_jack_client ) diff -Nru vlc-3.0.18/modules/access/linsys/linsys_hdsdi.c vlc-3.0.20/modules/access/linsys/linsys_hdsdi.c --- vlc-3.0.18/modules/access/linsys/linsys_hdsdi.c 2018-02-19 15:53:40.000000000 +0000 +++ vlc-3.0.20/modules/access/linsys/linsys_hdsdi.c 2023-02-11 09:33:17.000000000 +0000 @@ -147,7 +147,7 @@ unsigned int i_frame_rate, i_frame_rate_base; unsigned int i_width, i_height, i_aspect, i_forced_aspect; unsigned int i_vblock_size, i_ablock_size; - mtime_t i_next_vdate, i_next_adate; + vlc_tick_t i_next_vdate, i_next_adate; int i_incr, i_aincr; /* ES stuff */ @@ -628,7 +628,7 @@ p_audio->i_channel * 2, p_sys->i_max_channel + 1 ); p_block->i_dts = p_block->i_pts - = p_sys->i_next_adate + (mtime_t)p_audio->i_delay + = p_sys->i_next_adate + (vlc_tick_t)p_audio->i_delay * INT64_C(1000000) / p_sys->i_sample_rate; p_block->i_length = p_sys->i_aincr; es_out_Send( p_demux->out, p_audio->p_es, p_block ); diff -Nru vlc-3.0.18/modules/access/linsys/linsys_sdi.c vlc-3.0.20/modules/access/linsys/linsys_sdi.c --- vlc-3.0.18/modules/access/linsys/linsys_sdi.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/linsys/linsys_sdi.c 2023-02-11 09:33:17.000000000 +0000 @@ -157,7 +157,7 @@ /* SDI sync */ int i_state; - mtime_t i_last_state_change; + vlc_tick_t i_last_state_change; unsigned int i_anc_size, i_active_size, i_picture_size; unsigned int i_line_offset, i_nb_lines; @@ -178,7 +178,7 @@ char *psz_telx, *psz_telx_lang; bool b_hd, b_vbi; vbi_raw_decoder rd_wss, rd_telx; - mtime_t i_next_date; + vlc_tick_t i_next_date; int i_incr; /* ES stuff */ @@ -934,7 +934,7 @@ if( unlikely( !p_block ) ) return VLC_ENOMEM; p_block->i_dts = p_block->i_pts = p_sys->i_next_date - + (mtime_t)p_audio->i_delay * INT64_C(1000000) / p_audio->i_rate; + + (vlc_tick_t)p_audio->i_delay * INT64_C(1000000) / p_audio->i_rate; p_output = (int16_t *)p_block->p_buffer; if ( p_audio->i_left_samples == p_audio->i_nb_samples && @@ -1290,7 +1290,7 @@ p_audio->i_delay = i_tmp; } if ( p_anc[13] & 0x1 ) - msg_Warn( p_demux, "asymetric audio is not supported" ); + msg_Warn( p_demux, "asymmetric audio is not supported" ); } else { @@ -1306,7 +1306,7 @@ p_audio->i_delay = i_tmp; } if ( p_anc[10] & 0x1 ) - msg_Warn( p_demux, "asymetric audio is not supported" ); + msg_Warn( p_demux, "asymmetric audio is not supported" ); } switch ( i_rate ) diff -Nru vlc-3.0.18/modules/access/live555.cpp vlc-3.0.20/modules/access/live555.cpp --- vlc-3.0.18/modules/access/live555.cpp 2022-07-23 08:04:37.000000000 +0000 +++ vlc-3.0.20/modules/access/live555.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * live555.cpp : LIVE555 Streaming Media support. ***************************************************************************** * Copyright (C) 2003-2007 VLC authors and VideoLAN - * $Id: 97b580e8d7613c0fae4f9360d15438bbf4eda6b6 $ + * $Id: b219147b0928068427085da19fb03c9dcbb49a52 $ * * Authors: Laurent Aimar * Derk-Jan Hartman @@ -305,7 +305,7 @@ int i_return; int i_error = VLC_EGENERIC; - /* if the rtsp URL may contain a sat.ip fake DNS, bail-out early and + /* if the rtsp URL may contain a sat.ip fake DNS, bail-out early and * let the SAT>IP module handle that */ if( !strncmp(p_demux->psz_location, "sat.ip", 6) ) { @@ -879,8 +879,8 @@ tk->b_rtcp_sync = false; tk->b_flushing_discontinuity = false; tk->i_next_block_flags = 0; - tk->i_prevpts = VLC_TS_INVALID; - tk->i_pcr = VLC_TS_INVALID; + tk->i_prevpts = VLC_TICK_INVALID; + tk->i_pcr = VLC_TICK_INVALID; tk->f_npt = 0.; dtsgen_Init( &tk->dtsgen ); tk->state = live_track_t::STATE_SELECTED; @@ -1265,7 +1265,7 @@ p_sys->b_no_data = true; p_sys->i_no_data_ti = 0; p_sys->b_rtcp_sync = false; - p_sys->i_pcr = VLC_TS_INVALID; + p_sys->i_pcr = VLC_TICK_INVALID; return i_return; } @@ -1294,10 +1294,10 @@ timeout = 60; /* default value from RFC2326 */ msg_Dbg( p_demux, "We have a timeout of %d seconds", timeout ); - mtime_t interval = (timeout - 2) * CLOCK_FREQ; + vlc_tick_t interval = (timeout - 2) * CLOCK_FREQ; vlc_timer_schedule( p_sys->timer, false, interval, interval); } - p_sys->i_pcr = VLC_TS_INVALID; + p_sys->i_pcr = VLC_TICK_INVALID; /* Retrieve the starttime if possible */ p_sys->f_npt_start = p_sys->ms->playStartTime(); @@ -1446,7 +1446,7 @@ if( b_send_pcr ) { - mtime_t i_minpcr = VLC_TS_INVALID; + vlc_tick_t i_minpcr = VLC_TICK_INVALID; bool b_need_flush = false; /* Check for gap in pts value */ @@ -1461,11 +1461,11 @@ /* Check for gap in pts value */ b_need_flush |= (tk->b_flushing_discontinuity); - if( i_minpcr == VLC_TS_INVALID || ( tk->i_pcr != VLC_TS_INVALID && i_minpcr > tk->i_pcr ) ) + if( i_minpcr == VLC_TICK_INVALID || ( tk->i_pcr != VLC_TICK_INVALID && i_minpcr > tk->i_pcr ) ) i_minpcr = tk->i_pcr; } - if( p_sys->i_pcr > VLC_TS_INVALID && b_need_flush ) + if( p_sys->i_pcr > VLC_TICK_INVALID && b_need_flush ) { es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); p_sys->i_pcr = i_minpcr; @@ -1474,22 +1474,22 @@ for( i = 0; i < p_sys->i_track; i++ ) { live_track_t *tk = p_sys->track[i]; - tk->i_prevpts = VLC_TS_INVALID; - tk->i_pcr = VLC_TS_INVALID; + tk->i_prevpts = VLC_TICK_INVALID; + tk->i_pcr = VLC_TICK_INVALID; tk->f_npt = 0.; tk->b_flushing_discontinuity = false; tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; } - if( p_sys->i_pcr != VLC_TS_INVALID ) - es_out_SetPCR( p_demux->out, VLC_TS_0 + + if( p_sys->i_pcr != VLC_TICK_INVALID ) + es_out_SetPCR( p_demux->out, VLC_TICK_0 + __MAX(0, p_sys->i_pcr - PCR_OFF) ); } - else if( p_sys->i_pcr == VLC_TS_INVALID || + else if( p_sys->i_pcr == VLC_TICK_INVALID || i_minpcr > p_sys->i_pcr + PCR_OBS ) { p_sys->i_pcr = __MAX(0, i_minpcr - PCR_OFF); - if( p_sys->i_pcr != VLC_TS_INVALID ) - es_out_SetPCR( p_demux->out, VLC_TS_0 + p_sys->i_pcr ); + if( p_sys->i_pcr != VLC_TICK_INVALID ) + es_out_SetPCR( p_demux->out, VLC_TICK_0 + p_sys->i_pcr ); } } @@ -1617,13 +1617,13 @@ p_sys->env->getResultMsg() ); return VLC_EGENERIC; } - p_sys->i_pcr = VLC_TS_INVALID; + p_sys->i_pcr = VLC_TICK_INVALID; for( int i = 0; i < p_sys->i_track; i++ ) { p_sys->track[i]->b_rtcp_sync = false; - p_sys->track[i]->i_prevpts = VLC_TS_INVALID; - p_sys->track[i]->i_pcr = VLC_TS_INVALID; + p_sys->track[i]->i_prevpts = VLC_TICK_INVALID; + p_sys->track[i]->i_pcr = VLC_TICK_INVALID; dtsgen_Resync( &p_sys->track[i]->dtsgen ); } @@ -1717,7 +1717,7 @@ /* ReSync the stream */ p_sys->f_npt_start = 0; - p_sys->i_pcr = VLC_TS_INVALID; + p_sys->i_pcr = VLC_TICK_INVALID; p_sys->f_npt = 0.0; *pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() ); @@ -1755,10 +1755,10 @@ tk->b_rtcp_sync = false; tk->b_flushing_discontinuity = false; tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; - tk->i_prevpts = VLC_TS_INVALID; - tk->i_pcr = VLC_TS_INVALID; + tk->i_prevpts = VLC_TICK_INVALID; + tk->i_pcr = VLC_TICK_INVALID; } - p_sys->i_pcr = VLC_TS_INVALID; + p_sys->i_pcr = VLC_TICK_INVALID; es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); } @@ -2123,7 +2123,7 @@ { msg_Dbg( p_demux, "tk->rtpSource->hasBeenSynchronizedUsingRTCP()" ); p_sys->b_rtcp_sync = tk->b_rtcp_sync = true; - if( tk->i_pcr != VLC_TS_INVALID ) + if( tk->i_pcr != VLC_TICK_INVALID ) { tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; const int64_t i_max_diff = CLOCK_FREQ * (( tk->fmt.i_cat == SPU_ES ) ? 60 : 1); @@ -2151,7 +2151,7 @@ default: if( i_pts != tk->i_prevpts ) { - p_block->i_pts = VLC_TS_0 + i_pts; + p_block->i_pts = VLC_TICK_0 + i_pts; tk->i_prevpts = i_pts; dtsgen_AddNextPTS( &tk->dtsgen, i_pts ); @@ -2168,7 +2168,7 @@ break; case VLC_CODEC_VP8: default: - p_block->i_dts = VLC_TS_0 + i_pts; + p_block->i_dts = VLC_TICK_0 + i_pts; break; } @@ -2181,9 +2181,9 @@ tk->i_next_block_flags = 0; } - mtime_t i_pcr = p_block->i_dts > VLC_TS_INVALID ? p_block->i_dts : p_block->i_pts; + vlc_tick_t i_pcr = p_block->i_dts > VLC_TICK_INVALID ? p_block->i_dts : p_block->i_pts; es_out_Send( p_demux->out, tk->p_es, p_block ); - if( i_pcr > VLC_TS_INVALID ) + if( i_pcr > VLC_TICK_INVALID ) { if( tk->i_pcr < i_pcr ) tk->i_pcr = i_pcr; diff -Nru vlc-3.0.18/modules/access/live555_dtsgen.h vlc-3.0.20/modules/access/live555_dtsgen.h --- vlc-3.0.18/modules/access/live555_dtsgen.h 2018-09-04 10:53:13.000000000 +0000 +++ vlc-3.0.20/modules/access/live555_dtsgen.h 2023-02-11 09:33:17.000000000 +0000 @@ -23,18 +23,18 @@ struct dtsgen_t { - mtime_t history[DTSGEN_HISTORY_COUNT]; - mtime_t ordereddts[DTSGEN_HISTORY_COUNT]; - mtime_t i_startingdts; - mtime_t i_startingdiff; + vlc_tick_t history[DTSGEN_HISTORY_COUNT]; + vlc_tick_t ordereddts[DTSGEN_HISTORY_COUNT]; + vlc_tick_t i_startingdts; + vlc_tick_t i_startingdiff; unsigned reorderdepth; unsigned count; }; static int cmpvlctickp(const void *p1, const void *p2) { - if(*((mtime_t *)p1) >= *((mtime_t *)p2)) - return *((mtime_t *)p1) > *((mtime_t *)p2) ? 1 : 0; + if(*((vlc_tick_t *)p1) >= *((vlc_tick_t *)p2)) + return *((vlc_tick_t *)p1) > *((vlc_tick_t *)p2) ? 1 : 0; else return -1; } @@ -88,7 +88,7 @@ * While receiving the N first packets (N>max reorder): * - check if it needs reorder, or increase depth * - create slow increments in DTS while taking any frame as a start, - * substracting the total difference between first and last packet, + * subtracting the total difference between first and last packet, * and removing the possible offset after reorder, * divided by max possible frames. * @@ -97,7 +97,7 @@ * (with mandatory gap/increase in DTS caused by previous step) */ -static void dtsgen_AddNextPTS(struct dtsgen_t *d, mtime_t i_pts) +static void dtsgen_AddNextPTS(struct dtsgen_t *d, vlc_tick_t i_pts) { /* Check saved pts in reception order to find reordering depth */ if(d->count > 0 && d->count < DTSGEN_HISTORY_COUNT) @@ -136,9 +136,9 @@ qsort(&d->ordereddts, d->count, sizeof(d->ordereddts[0]), cmpvlctickp); } -static mtime_t dtsgen_GetDTS(struct dtsgen_t *d) +static vlc_tick_t dtsgen_GetDTS(struct dtsgen_t *d) { - mtime_t i_dts = VLC_TS_INVALID; + vlc_tick_t i_dts = VLC_TICK_INVALID; /* When we have inspected enough packets, * use the reorderdepth th packet as dts offset */ @@ -151,12 +151,12 @@ else if(d->count == 1) { d->i_startingdts = - i_dts = __MAX(d->history[0] - 150000, VLC_TS_0); + i_dts = __MAX(d->history[0] - 150000, VLC_TICK_0); d->i_startingdiff = d->history[0] - i_dts; } else if(d->count > 1) { - mtime_t i_diff = d->ordereddts[d->count - 1] - + vlc_tick_t i_diff = d->ordereddts[d->count - 1] - d->ordereddts[0]; i_diff = __MIN(d->i_startingdiff, i_diff); d->i_startingdts += i_diff / DTSGEN_REORDER_MAX; @@ -168,9 +168,9 @@ #ifdef DTSGEN_DEBUG static void dtsgen_Debug(vlc_object_t *p_demux, struct dtsgen_t *d, - mtime_t dts, mtime_t pts) + vlc_tick_t dts, vlc_tick_t pts) { - if(pts == VLC_TS_INVALID) + if(pts == VLC_TICK_INVALID) return; msg_Dbg(p_demux, "dtsgen %" PRId64 " / pts %" PRId64 " diff %" PRId64 ", " "pkt count %u, reorder %u", diff -Nru vlc-3.0.18/modules/access/mms/mmsh.c vlc-3.0.20/modules/access/mms/mmsh.c --- vlc-3.0.18/modules/access/mms/mmsh.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/mms/mmsh.c 2023-10-30 07:20:48.000000000 +0000 @@ -2,7 +2,7 @@ * mmsh.c: ***************************************************************************** * Copyright (C) 2001, 2002 VLC authors and VideoLAN - * $Id: d2f497dd947509e9a5cfe7e7c3aa7849ecb377d8 $ + * $Id$ * * Authors: Laurent Aimar * @@ -450,7 +450,7 @@ var_InheritBool( p_access, "audio" ), var_InheritBool( p_access, "video" ) ); - /* Check we have comptible asfh */ + /* Check we have compatible asfh */ for( i = 1; i < 128; i++ ) { asf_stream_t *p_old = &old_asfh.stream[i]; @@ -927,7 +927,15 @@ if( restsize < 8 ) p_ck->i_size2 = 8; else + { p_ck->i_size2 = GetWLE( p_sys->buffer + 10); + if (p_ck->i_size2 < 8 /* Prevent underflow when set to i_data */ + || p_ck->i_size2 - 8 > BUFFER_SIZE - 12 /* Prevent Out Of Bound Write */) + { + msg_Err(p_access, "invalid size2: %" PRIu16, p_ck->i_size2); + return VLC_EGENERIC; + } + } p_ck->p_data = p_sys->buffer + 12; p_ck->i_data = p_ck->i_size2 - 8; diff -Nru vlc-3.0.18/modules/access/mms/mmstu.h vlc-3.0.20/modules/access/mms/mmstu.h --- vlc-3.0.18/modules/access/mms/mmstu.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/mms/mmstu.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * mmstu.h: MMS access plug-in ***************************************************************************** * Copyright (C) 2001, 2002 VLC authors and VideoLAN - * $Id: 186f8f1a4baad9f15aac493c3285ea417c1caf0b $ + * $Id: 4cd7dc8c50fac7760bc2046bdef24a85e77395f1 $ * * Authors: Laurent Aimar * @@ -67,7 +67,7 @@ int i_packet_seq_num; uint8_t *p_cmd; /* latest command read */ - size_t i_cmd; /* allocated at the begining */ + size_t i_cmd; /* allocated at the beginning */ uint8_t *p_header; /* allocated by mms_ReadPacket */ size_t i_header; diff -Nru vlc-3.0.18/modules/access/oss.c vlc-3.0.20/modules/access/oss.c --- vlc-3.0.18/modules/access/oss.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/oss.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * oss.c : OSS input module for vlc ***************************************************************************** * Copyright (C) 2002-2009 VLC authors and VideoLAN - * $Id: d50a23cdb030354acd30a7329fc08a462006431b $ + * $Id: c857fa3e8a79d2fadc203cf684076cb156e4f92b $ * * Authors: Benjamin Pracht * Richard Hosking @@ -54,7 +54,7 @@ #include /***************************************************************************** - * Module descriptior + * Module descriptor *****************************************************************************/ static int DemuxOpen ( vlc_object_t * ); @@ -321,7 +321,7 @@ /* Timestamp */ p_block->i_pts = p_block->i_dts = - mdate() - INT64_C(1000000) * (mtime_t)i_correct / + mdate() - INT64_C(1000000) * (vlc_tick_t)i_correct / 2 / ( p_sys->b_stereo ? 2 : 1) / p_sys->i_sample_rate; return p_block; diff -Nru vlc-3.0.18/modules/access/pulse.c vlc-3.0.20/modules/access/pulse.c --- vlc-3.0.18/modules/access/pulse.c 2017-11-29 23:35:29.000000000 +0000 +++ vlc-3.0.20/modules/access/pulse.c 2023-02-11 09:33:17.000000000 +0000 @@ -59,7 +59,7 @@ es_out_id_t *es; bool discontinuity; /**< The next block will not follow the last one */ unsigned framesize; /**< Byte size of a sample */ - mtime_t caching; /**< Caching value */ + vlc_tick_t caching; /**< Caching value */ }; /* Stream helpers */ @@ -161,7 +161,7 @@ return; } - mtime_t pts = mdate(); + vlc_tick_t pts = mdate(); pa_usec_t latency; int negative; diff -Nru vlc-3.0.18/modules/access/rdp.c vlc-3.0.20/modules/access/rdp.c --- vlc-3.0.18/modules/access/rdp.c 2019-03-29 19:01:15.000000000 +0000 +++ vlc-3.0.20/modules/access/rdp.c 2023-02-11 09:33:17.000000000 +0000 @@ -112,7 +112,7 @@ float f_fps; int i_frame_interval; - mtime_t i_starttime; + vlc_tick_t i_starttime; es_out_id_t *es; @@ -339,7 +339,7 @@ demux_t *p_demux = (demux_t *) p_data; demux_sys_t *p_sys = p_demux->p_sys; p_sys->i_starttime = mdate(); - mtime_t i_next_frame_date = mdate() + p_sys->i_frame_interval; + vlc_tick_t i_next_frame_date = mdate() + p_sys->i_frame_interval; int i_ret; for(;;) diff -Nru vlc-3.0.18/modules/access/rtp/input.c vlc-3.0.20/modules/access/rtp/input.c --- vlc-3.0.18/modules/access/rtp/input.c 2018-12-16 20:35:31.000000000 +0000 +++ vlc-3.0.20/modules/access/rtp/input.c 2023-02-11 09:33:17.000000000 +0000 @@ -85,12 +85,12 @@ block_Release (block); } -static int rtp_timeout (mtime_t deadline) +static int rtp_timeout (vlc_tick_t deadline) { - if (deadline == VLC_TS_INVALID) + if (deadline == VLC_TICK_INVALID) return -1; /* infinite */ - mtime_t t = mdate (); + vlc_tick_t t = mdate (); if (t >= deadline) return 0; @@ -107,7 +107,7 @@ { demux_t *demux = opaque; demux_sys_t *sys = demux->p_sys; - mtime_t deadline = VLC_TS_INVALID; + vlc_tick_t deadline = VLC_TICK_INVALID; int rtp_fd = sys->fd; #ifdef __linux__ const int trunc_flag = MSG_TRUNC; @@ -182,7 +182,7 @@ dequeue: if (!rtp_dequeue (demux, sys->session, &deadline)) - deadline = VLC_TS_INVALID; + deadline = VLC_TICK_INVALID; vlc_restorecancel (canc); } return NULL; diff -Nru vlc-3.0.18/modules/access/rtp/rtp.c vlc-3.0.20/modules/access/rtp/rtp.c --- vlc-3.0.18/modules/access/rtp/rtp.c 2020-04-28 12:32:05.000000000 +0000 +++ vlc-3.0.20/modules/access/rtp/rtp.c 2023-02-11 09:33:17.000000000 +0000 @@ -445,7 +445,7 @@ { if (data) { - block->i_dts = VLC_TS_INVALID; /* RTP does not specify this */ + block->i_dts = VLC_TICK_INVALID; /* RTP does not specify this */ es_out_SetPCR(demux->out, block->i_pts); es_out_Send (demux->out, (es_out_id_t *)data, block); } diff -Nru vlc-3.0.18/modules/access/rtp/rtp.h vlc-3.0.20/modules/access/rtp/rtp.h --- vlc-3.0.18/modules/access/rtp/rtp.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/rtp/rtp.h 2023-02-11 09:33:17.000000000 +0000 @@ -54,7 +54,7 @@ rtp_session_t *rtp_session_create (demux_t *); void rtp_session_destroy (demux_t *, rtp_session_t *); void rtp_queue (demux_t *, rtp_session_t *, block_t *); -bool rtp_dequeue (demux_t *, const rtp_session_t *, mtime_t *); +bool rtp_dequeue (demux_t *, const rtp_session_t *, vlc_tick_t *); void rtp_dequeue_force (demux_t *, const rtp_session_t *); int rtp_add_type (demux_t *demux, rtp_session_t *ses, const rtp_pt_t *pt); @@ -73,7 +73,7 @@ int rtcp_fd; vlc_thread_t thread; - mtime_t timeout; + vlc_tick_t timeout; uint16_t max_dropout; /**< Max packet forward misordering */ uint16_t max_misorder; /**< Max packet backward misordering */ uint8_t max_src; /**< Max simultaneous RTP sources */ diff -Nru vlc-3.0.18/modules/access/rtp/session.c vlc-3.0.20/modules/access/rtp/session.c --- vlc-3.0.18/modules/access/rtp/session.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/rtp/session.c 2023-02-11 09:33:17.000000000 +0000 @@ -139,11 +139,11 @@ { uint32_t ssrc; uint32_t jitter; /* interarrival delay jitter estimate */ - mtime_t last_rx; /* last received packet local timestamp */ + vlc_tick_t last_rx; /* last received packet local timestamp */ uint32_t last_ts; /* last received packet RTP timestamp */ uint32_t ref_rtp; /* sender RTP timestamp reference */ - mtime_t ref_ntp; /* sender NTP timestamp reference */ + vlc_tick_t ref_ntp; /* sender NTP timestamp reference */ uint16_t bad_seq; /* tentatively next expected sequence for resync */ uint16_t max_seq; /* next expected sequence */ @@ -169,7 +169,7 @@ source->ssrc = ssrc; source->jitter = 0; source->ref_rtp = 0; - /* TODO: use VLC_TS_0, but VLC does not like negative PTS at the moment */ + /* TODO: use VLC_TICK_0, but VLC does not like negative PTS at the moment */ source->ref_ntp = UINT64_C (1) << 62; source->max_seq = source->bad_seq = init_seq; source->last_seq = init_seq - 1; @@ -257,7 +257,7 @@ block->i_buffer -= padding; } - mtime_t now = mdate (); + vlc_tick_t now = mdate (); rtp_source_t *src = NULL; const uint16_t seq = rtp_seq (block); const uint32_t ssrc = GetDWBE (block->p_buffer + 8); @@ -392,9 +392,9 @@ * In the later case, *deadlinep is undefined. */ bool rtp_dequeue (demux_t *demux, const rtp_session_t *session, - mtime_t *restrict deadlinep) + vlc_tick_t *restrict deadlinep) { - mtime_t now = mdate (); + vlc_tick_t now = mdate (); bool pending = false; *deadlinep = INT64_MAX; @@ -431,7 +431,7 @@ /* Wait for 3 times the inter-arrival delay variance (about 99.7% * match for random gaussian jitter). */ - mtime_t deadline; + vlc_tick_t deadline; const rtp_pt_t *pt = rtp_find_ptype (session, src, block, NULL); if (pt) deadline = CLOCK_FREQ * 3 * src->jitter / pt->frequency; @@ -442,7 +442,7 @@ if (deadline < (CLOCK_FREQ / 40)) deadline = CLOCK_FREQ / 40; - /* Additionnaly, we implicitly wait for the packetization time + /* Additionally, we implicitly wait for the packetization time * multiplied by the number of missing packets. block is the first * non-missing packet (lowest sequence number). We have no better * estimated time of arrival, as we do not know the RTP timestamp diff -Nru vlc-3.0.18/modules/access/rtp/srtp.c vlc-3.0.20/modules/access/rtp/srtp.c --- vlc-3.0.18/modules/access/rtp/srtp.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/rtp/srtp.c 2023-01-01 22:21:52.000000000 +0000 @@ -124,7 +124,7 @@ * multiple simultaneous sessions with the same master key. * * @param encr encryption algorithm number - * @param auth authentication algortihm number + * @param auth authentication algorithm number * @param tag_len authentication tag byte length (NOT including RCC) * @param flags OR'ed optional flags. * diff -Nru vlc-3.0.18/modules/access/satip.c vlc-3.0.20/modules/access/satip.c --- vlc-3.0.18/modules/access/satip.c 2018-02-19 15:53:40.000000000 +0000 +++ vlc-3.0.20/modules/access/satip.c 2023-02-11 09:33:17.000000000 +0000 @@ -184,10 +184,10 @@ /* * Semi-interruptible net_Gets replacement. - * If an interruption is occuring it will fallback to non-interruptible read + * If an interruption is occurring it will fallback to non-interruptible read * with a given timeout before it returns. * - * interrupted: Informs the caller whether an interrupt occured or not + * interrupted: Informs the caller whether an interrupt occurred or not */ static char *net_readln_timeout(vlc_object_t *obj, int fd, int timeout, bool *interrupted) { @@ -424,9 +424,9 @@ stream_t *access = data; access_sys_t *sys = access->p_sys; int sock = sys->udp_sock; - mtime_t last_recv = mdate(); + vlc_tick_t last_recv = mdate(); ssize_t len; - mtime_t next_keepalive = mdate() + sys->keepalive_interval * 1000 * 1000; + vlc_tick_t next_keepalive = mdate() + sys->keepalive_interval * 1000 * 1000; #ifdef HAVE_RECVMMSG struct mmsghdr msgs[VLEN]; struct iovec iovecs[VLEN]; diff -Nru vlc-3.0.18/modules/access/screen/screen.h vlc-3.0.20/modules/access/screen/screen.h --- vlc-3.0.18/modules/access/screen/screen.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/screen/screen.h 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * screen.h: Screen capture module. ***************************************************************************** * Copyright (C) 2004-2008 VLC authors and VideoLAN - * $Id: cd5fe3b191ae5ef45b0e64bec6ba1fd60e340f6e $ + * $Id: 0403860244545d46a62917a1787c825c25309e4b $ * * Authors: Gildas Bazin * Antoine Cellerier @@ -45,10 +45,10 @@ es_out_id_t *es; float f_fps; - mtime_t i_next_date; + vlc_tick_t i_next_date; int i_incr; - mtime_t i_start; + vlc_tick_t i_start; #ifdef SCREEN_SUBSCREEN bool b_follow_mouse; diff -Nru vlc-3.0.18/modules/access/screen/xcb.c vlc-3.0.20/modules/access/screen/xcb.c --- vlc-3.0.18/modules/access/screen/xcb.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/screen/xcb.c 2023-02-11 09:33:17.000000000 +0000 @@ -235,7 +235,7 @@ if (!p_sys->rate) goto error; - mtime_t interval = (float)CLOCK_FREQ / p_sys->rate; + vlc_tick_t interval = (float)CLOCK_FREQ / p_sys->rate; if (!interval) goto error; diff -Nru vlc-3.0.18/modules/access/shm.c vlc-3.0.20/modules/access/shm.c --- vlc-3.0.18/modules/access/shm.c 2017-11-29 23:35:29.000000000 +0000 +++ vlc-3.0.20/modules/access/shm.c 2023-02-11 09:33:17.000000000 +0000 @@ -221,7 +221,7 @@ if (rate <= 0.f) goto error; - mtime_t interval = llroundf((float)CLOCK_FREQ / rate); + vlc_tick_t interval = llroundf((float)CLOCK_FREQ / rate); if (!interval) goto error; diff -Nru vlc-3.0.18/modules/access/smb2.c vlc-3.0.20/modules/access/smb2.c --- vlc-3.0.18/modules/access/smb2.c 2022-07-23 08:04:37.000000000 +0000 +++ vlc-3.0.20/modules/access/smb2.c 2023-08-05 10:03:51.000000000 +0000 @@ -663,7 +663,8 @@ static int vlc_smb2_connect_open_share(stream_t *access, const char *url, - const vlc_credential *credential) + const vlc_credential *credential, + bool guest_with_valid_passwd) { struct access_sys *sys = access->p_sys; @@ -673,7 +674,7 @@ if (sys->smb2 == NULL) { msg_Err(access, "smb2_init_context failed"); - return -1; + return -ENOMEM; } smb2_url = smb2_parse_url(sys->smb2, url); @@ -692,7 +693,7 @@ { username = "Guest"; /* A NULL password enable ntlmssp anonymous login */ - password = NULL; + password = guest_with_valid_passwd ? "" : NULL; } smb2_set_security_mode(sys->smb2, SMB2_NEGOTIATE_SIGNING_ENABLED); @@ -854,13 +855,27 @@ * keystore/user interaction) */ vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL, NULL); - ret = vlc_smb2_connect_open_share(access, url, &credential); + ret = vlc_smb2_connect_open_share(access, url, &credential, false); + if (ret == -EINVAL && credential.psz_username == NULL) + { + /* Since last Windows 11 update (KB5026436), Windows SMB servers need a + * valid Auth (user + password) even for a guest/anonymous login. The + * server will return 'STATUS_INVALID_PARAMETER' (so, libsmb2 will + * return '-EINVAL') if the password is invalid. Therefore, try to + * connect again with a valid password in that case. + * + * We don't try to connect with a valid password on the first try since + * it seems to break anonymous login with other samba servers (but + * samba.c doesn't have this problem so this might be libsmb2 issue). + * */ + ret = vlc_smb2_connect_open_share(access, url, &credential, true); + } while (VLC_SMB2_STATUS_DENIED(ret) && vlc_credential_get(&credential, access, "smb-user", "smb-pwd", SMB_LOGIN_DIALOG_TITLE, SMB_LOGIN_DIALOG_TEXT, sys->encoded_url.psz_host)) - ret = vlc_smb2_connect_open_share(access, url, &credential); + ret = vlc_smb2_connect_open_share(access, url, &credential, false); free(resolved_host); free(url); if (ret == 0) diff -Nru vlc-3.0.18/modules/access/srt.c vlc-3.0.20/modules/access/srt.c --- vlc-3.0.18/modules/access/srt.c 2022-02-21 09:19:30.000000000 +0000 +++ vlc-3.0.20/modules/access/srt.c 2023-02-11 09:33:17.000000000 +0000 @@ -191,7 +191,7 @@ &(int) { SRT_EPOLL_ERR | SRT_EPOLL_IN }); /* Schedule a connect */ - msg_Dbg( p_stream, "Schedule SRT connect (dest addresss: %s, port: %d).", + msg_Dbg( p_stream, "Schedule SRT connect (dest address: %s, port: %d).", p_sys->psz_host, p_sys->i_port); stat = srt_connect( p_sys->sock, res->ai_addr, res->ai_addrlen ); diff -Nru vlc-3.0.18/modules/access/timecode.c vlc-3.0.20/modules/access/timecode.c --- vlc-3.0.18/modules/access/timecode.c 2017-11-29 23:35:29.000000000 +0000 +++ vlc-3.0.20/modules/access/timecode.c 2023-02-11 09:33:17.000000000 +0000 @@ -55,13 +55,13 @@ { es_out_id_t *es; date_t date; - mtime_t next_time; + vlc_tick_t next_time; }; static int DemuxOnce (demux_t *demux, bool master) { demux_sys_t *sys = demux->p_sys; - mtime_t pts = date_Get (&sys->date); + vlc_tick_t pts = date_Get (&sys->date); lldiv_t d; unsigned h, m, s, f; @@ -97,7 +97,7 @@ { demux_sys_t *sys = demux->p_sys; - if (sys->next_time == VLC_TS_INVALID) /* Master mode */ + if (sys->next_time == VLC_TICK_INVALID) /* Master mode */ return DemuxOnce (demux, true); /* Slave mode */ @@ -134,9 +134,9 @@ case DEMUX_SET_NEXT_DEMUX_TIME: { - const mtime_t pts = va_arg (args, int64_t ); + const vlc_tick_t pts = va_arg (args, int64_t ); - if (sys->next_time == VLC_TS_INVALID) /* first invocation? */ + if (sys->next_time == VLC_TICK_INVALID) /* first invocation? */ { date_Set (&sys->date, pts); date_Decrement (&sys->date, 1); @@ -185,8 +185,8 @@ } date_Init (&sys->date, num, den); - date_Set (&sys->date, VLC_TS_0); - sys->next_time = VLC_TS_INVALID; + date_Set (&sys->date, VLC_TICK_0); + sys->next_time = VLC_TICK_INVALID; demux->p_sys = sys; demux->pf_demux = Demux; diff -Nru vlc-3.0.18/modules/access/v4l2/demux.c vlc-3.0.20/modules/access/v4l2/demux.c --- vlc-3.0.18/modules/access/v4l2/demux.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/v4l2/demux.c 2023-02-11 09:33:17.000000000 +0000 @@ -57,7 +57,7 @@ es_out_id_t *es; vlc_v4l2_ctrl_t *controls; - mtime_t start; + vlc_tick_t start; #ifdef ZVBI_COMPILED vlc_v4l2_vbi_t *vbi; diff -Nru vlc-3.0.18/modules/access/v4l2/lib.c vlc-3.0.20/modules/access/v4l2/lib.c --- vlc-3.0.18/modules/access/v4l2/lib.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/v4l2/lib.c 2023-02-11 09:33:17.000000000 +0000 @@ -31,6 +31,12 @@ #include "v4l2.h" +#ifdef __OpenBSD__ +#define V4L2_LIB "libv4l2.so" +#else +#define V4L2_LIB "libv4l2.so.0" +#endif + static int fd_open (int fd, int flags) { (void) flags; @@ -56,7 +62,7 @@ h = dlopen ("libmediaclient.so", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); if (h == NULL) - h = dlopen ("libv4l2.so.0", RTLD_LAZY | RTLD_LOCAL); + h = dlopen (V4L2_LIB, RTLD_LAZY | RTLD_LOCAL); if (h == NULL) return; diff -Nru vlc-3.0.18/modules/access/v4l2/radio.c vlc-3.0.20/modules/access/v4l2/radio.c --- vlc-3.0.18/modules/access/v4l2/radio.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/access/v4l2/radio.c 2023-02-11 09:33:17.000000000 +0000 @@ -34,7 +34,7 @@ { int fd; vlc_v4l2_ctrl_t *controls; - mtime_t start; + vlc_tick_t start; }; static int RadioControl (demux_t *demux, int query, va_list args) diff -Nru vlc-3.0.18/modules/access/v4l2/v4l2.c vlc-3.0.20/modules/access/v4l2/v4l2.c --- vlc-3.0.18/modules/access/v4l2/v4l2.c 2017-12-10 23:14:54.000000000 +0000 +++ vlc-3.0.20/modules/access/v4l2/v4l2.c 2023-02-11 09:33:17.000000000 +0000 @@ -483,7 +483,7 @@ fd = rawfd; } - /* Get device capabilites */ + /* Get device capabilities */ struct v4l2_capability cap; if (v4l2_ioctl (fd, VIDIOC_QUERYCAP, &cap) < 0) { diff -Nru vlc-3.0.18/modules/access/v4l2/v4l2.h vlc-3.0.20/modules/access/v4l2/v4l2.h --- vlc-3.0.18/modules/access/v4l2/v4l2.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/v4l2/v4l2.h 2023-02-11 09:33:17.000000000 +0000 @@ -18,7 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#if defined(HAVE_LINUX_VIDEODEV2_H) +# include +#elif defined(HAVE_SYS_VIDEOIO_H) +# include +# include +#endif /* libv4l2 functions */ extern int (*v4l2_fd_open) (int, int); @@ -55,7 +60,7 @@ struct buffer_t *StartMmap (vlc_object_t *, int, uint32_t *); void StopMmap (int, struct buffer_t *, uint32_t); -mtime_t GetBufferPTS (const struct v4l2_buffer *); +vlc_tick_t GetBufferPTS (const struct v4l2_buffer *); block_t* GrabVideo (vlc_object_t *, int, const struct buffer_t *); #ifdef ZVBI_COMPILED diff -Nru vlc-3.0.18/modules/access/v4l2/video.c vlc-3.0.20/modules/access/v4l2/video.c --- vlc-3.0.18/modules/access/v4l2/video.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access/v4l2/video.c 2023-02-11 09:33:17.000000000 +0000 @@ -560,9 +560,9 @@ return 0; } -mtime_t GetBufferPTS (const struct v4l2_buffer *buf) +vlc_tick_t GetBufferPTS (const struct v4l2_buffer *buf) { - mtime_t pts; + vlc_tick_t pts; switch (buf->flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) { diff -Nru vlc-3.0.18/modules/access/vcd/cdrom.c vlc-3.0.20/modules/access/vcd/cdrom.c --- vlc-3.0.18/modules/access/vcd/cdrom.c 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/modules/access/vcd/cdrom.c 2023-10-20 02:02:44.000000000 +0000 @@ -2,7 +2,7 @@ * cdrom.c: cdrom tools ***************************************************************************** * Copyright (C) 1998-2001 VLC authors and VideoLAN - * $Id: 4d9f4f1f9657438ab4f66f3c6bceb10cb95fe801 $ + * $Id$ * * Authors: Johan Bilien * Gildas Bazin @@ -428,7 +428,7 @@ int i; p_toc->p_sectors = calloc( p_toc->i_tracks + 1, sizeof(*p_toc->p_sectors) ); - if( *p_toc->p_sectors == NULL ) + if( p_toc->p_sectors == NULL ) { vcddev_toc_Free( p_toc ); return NULL; @@ -856,7 +856,7 @@ p_vcddev->i_vcdimage_handle = vlc_open( psz_vcdfile, O_RDONLY | O_NONBLOCK | O_BINARY ); - while( fgets( line, 1024, cuefile ) && !b_found ) + while( !b_found && fgets( line, 1024, cuefile ) ) { /* We have a cue file, but no valid vcd file yet */ char filename[1024]; diff -Nru vlc-3.0.18/modules/access/vcd/vcd.c vlc-3.0.20/modules/access/vcd/vcd.c --- vlc-3.0.18/modules/access/vcd/vcd.c 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/modules/access/vcd/vcd.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * vcd.c : VCD input module for vlc ***************************************************************************** * Copyright © 2000-2011 VLC authors and VideoLAN - * $Id: 7b302e49059484c4da9d5f3065fd29c6891a87dc $ + * $Id: 817fc96dd2ea2357d6fe620f75d9f0b83d70b5af $ * * Author: Johan Bilien * @@ -38,7 +38,7 @@ #include "cdrom.h" /***************************************************************************** - * Module descriptior + * Module descriptor *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); diff -Nru vlc-3.0.18/modules/access/vnc.c vlc-3.0.20/modules/access/vnc.c --- vlc-3.0.18/modules/access/vnc.c 2022-09-30 07:59:11.000000000 +0000 +++ vlc-3.0.20/modules/access/vnc.c 2023-02-11 09:33:17.000000000 +0000 @@ -121,7 +121,7 @@ float f_fps; int i_frame_interval; - mtime_t i_starttime; + vlc_tick_t i_starttime; es_out_id_t *es; }; @@ -343,7 +343,7 @@ { demux_t *p_demux = (demux_t *) p_data; demux_sys_t *p_sys = p_demux->p_sys; - mtime_t i_next_frame_date = mdate() + p_sys->i_frame_interval; + vlc_tick_t i_next_frame_date = mdate() + p_sys->i_frame_interval; int i_status; for(;;) diff -Nru vlc-3.0.18/modules/access/wasapi.c vlc-3.0.20/modules/access/wasapi.c --- vlc-3.0.18/modules/access/wasapi.c 2017-11-29 23:35:29.000000000 +0000 +++ vlc-3.0.20/modules/access/wasapi.c 2023-02-11 09:33:17.000000000 +0000 @@ -223,7 +223,7 @@ } static es_out_id_t *CreateES(demux_t *demux, IAudioClient *client, bool loop, - mtime_t caching, size_t *restrict frame_size) + vlc_tick_t caching, size_t *restrict frame_size) { es_format_t fmt; WAVEFORMATEX *pwf; @@ -273,8 +273,8 @@ es_out_id_t *es; size_t frame_size; - mtime_t caching; - mtime_t start_time; + vlc_tick_t caching; + vlc_tick_t start_time; HANDLE events[2]; union { @@ -318,7 +318,7 @@ UINT32 frames; DWORD flags; UINT64 qpc; - mtime_t pts; + vlc_tick_t pts; hr = IAudioCaptureClient_GetBuffer(capture, &data, &frames, &flags, NULL, &qpc); diff -Nru vlc-3.0.18/modules/access_output/livehttp.c vlc-3.0.20/modules/access_output/livehttp.c --- vlc-3.0.18/modules/access_output/livehttp.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access_output/livehttp.c 2023-02-11 09:33:17.000000000 +0000 @@ -179,10 +179,10 @@ char *psz_indexPath; char *psz_indexUrl; char *psz_keyfile; - mtime_t i_keyfile_modification; - mtime_t i_opendts; - mtime_t i_dts_offset; - mtime_t i_seglenm; + vlc_tick_t i_keyfile_modification; + vlc_tick_t i_opendts; + vlc_tick_t i_dts_offset; + vlc_tick_t i_seglenm; uint32_t i_segment; size_t i_seglen; float f_seglen; @@ -254,7 +254,7 @@ vlc_array_init( &p_sys->segments_t ); p_sys->stuffing_size = 0; - p_sys->i_opendts = VLC_TS_INVALID; + p_sys->i_opendts = VLC_TICK_INVALID; p_sys->i_dts_offset = 0; p_sys->psz_indexPath = NULL; @@ -340,7 +340,7 @@ GCRY_CIPHER_MODE_CBC, 0 ); if( err ) { - msg_Err( p_access, "Openin AES Cipher failed: %s", gpg_strerror(err)); + msg_Err( p_access, "Opening AES Cipher failed: %s", gpg_strerror(err)); free( keyfile ); return VLC_EGENERIC; } @@ -514,7 +514,7 @@ } /************************************************************************ - * segmentAmountNeeded: check that playlist has atleast 3*p_sys->i_seglength of segments + * segmentAmountNeeded: check that playlist has at least 3*p_sys->i_seglength of segments * return how many segments are needed for that (max of p_sys->i_segment ) ************************************************************************/ static uint32_t segmentAmountNeeded( sout_access_out_sys_t *p_sys ) @@ -947,7 +947,7 @@ msg_Dbg( p_access, "Writing all full segments" ); block_t *output = p_sys->full_segments; - mtime_t output_last_length = 0; + vlc_tick_t output_last_length = 0; if( output ) output_last_length = output->i_length; if( *p_sys->full_segments_end ) @@ -956,10 +956,10 @@ p_sys->full_segments_end = &p_sys->full_segments; ssize_t i_write=0; - bool crypted = false; + bool encrypted = false; while( output ) { - if( p_sys->key_uri && !crypted ) + if( p_sys->key_uri && !encrypted ) { if( p_sys->stuffing_size ) { @@ -986,7 +986,7 @@ msg_Err( p_access, "Encryption failure: %s ", gpg_strerror(err) ); return -1; } - crypted=true; + encrypted=true; } @@ -1007,7 +1007,7 @@ block_t *p_next = output->p_next; block_Release (output); output = p_next; - crypted=false; + encrypted=false; } else { diff -Nru vlc-3.0.18/modules/access_output/rist.c vlc-3.0.20/modules/access_output/rist.c --- vlc-3.0.18/modules/access_output/rist.c 2021-01-17 20:31:01.000000000 +0000 +++ vlc-3.0.20/modules/access_output/rist.c 2023-02-11 09:33:17.000000000 +0000 @@ -111,7 +111,7 @@ return flow; } -static struct rist_flow *rist_udp_transmitter(sout_access_out_t *p_access, char *psz_dst_server, +static struct rist_flow *rist_udp_transmitter(sout_access_out_t *p_access, char *psz_dst_server, int i_dst_port, bool b_ismulticast) { struct rist_flow *flow; @@ -198,11 +198,11 @@ } else { - msg_Dbg(p_access, " Sending Nack #%d (age %"PRId64" ms), current seq is: [%d]", + msg_Dbg(p_access, " Sending Nack #%d (age %"PRId64" ms), current seq is: [%d]", seq, age, flow->wi); p_sys->i_retransmit_packets++; vlc_mutex_lock( &p_sys->fd_lock ); - if (rist_Write(flow->fd_out, pkt->buffer->p_buffer, pkt->buffer->i_buffer) + if (rist_Write(flow->fd_out, pkt->buffer->p_buffer, pkt->buffer->i_buffer) != (ssize_t)pkt->buffer->i_buffer) { msg_Err(p_access, "Error sending retransmitted packet after 2 tries ..."); } @@ -211,13 +211,13 @@ } } -static void process_nack(sout_access_out_t *p_access, uint8_t ptype, uint16_t nrecords, +static void process_nack(sout_access_out_t *p_access, uint8_t ptype, uint16_t nrecords, struct rist_flow *flow, uint8_t *pkt) { sout_access_out_sys_t *p_sys = p_access->p_sys; int i,j; - /*msg_Info(p_access, " Nack (BbRR), %d record(s), Window: [%d:%d-->%d]", nrecords, + /*msg_Info(p_access, " Nack (BbRR), %d record(s), Window: [%d:%d-->%d]", nrecords, flow->ri, flow->wi, flow->wi-flow->ri);*/ if (ptype == RTCP_PT_RTPFR) @@ -266,12 +266,12 @@ } else { - msg_Err(p_access, " !!! Wrong feedback. Ptype is %02x!=%02x, FMT: %02x", ptype, + msg_Err(p_access, " !!! Wrong feedback. Ptype is %02x!=%02x, FMT: %02x", ptype, RTCP_PT_RTPFR, rist_rtcp_fb_get_fmt(pkt)); } } -static void rist_rtcp_recv(sout_access_out_t *p_access, struct rist_flow *flow, uint8_t *pkt_raw, +static void rist_rtcp_recv(sout_access_out_t *p_access, struct rist_flow *flow, uint8_t *pkt_raw, size_t len) { sout_access_out_sys_t *p_sys = p_access->p_sys; @@ -287,9 +287,9 @@ if ( bytes_left < 4 ) { /* we must have at least 4 bytes */ - msg_Err(p_access, "Rist rtcp packet must have at least 4 bytes, we have %d", + msg_Err(p_access, "Rist rtcp packet must have at least 4 bytes, we have %d", bytes_left); - return; + return; } else if (!rist_rtp_check_hdr(pkt)) { @@ -305,7 +305,7 @@ { /* check for a sane number of bytes */ msg_Err(p_access, "Malformed feedback packet, wrong len %d, expecting %u bytes in the" \ - " packet, got a buffer of %u bytes. ptype = %d", rist_rtcp_get_length(pkt), bytes, + " packet, got a buffer of %u bytes. ptype = %d", rist_rtcp_get_length(pkt), bytes, bytes_left, ptype); return; } @@ -434,7 +434,7 @@ "cut, please keep it under %d bytes", r, RTP_PKT_SIZE); } if (unlikely(r == -1)) { - msg_Err(p_access, "socket %d error: %s\n", p_sys->flow->fd_rtcp, + msg_Err(p_access, "socket %d error: %s\n", p_sys->flow->fd_rtcp, gai_strerror(errno)); } else { @@ -489,7 +489,7 @@ block_t *out = block_FifoGet( p_sys->p_fifo ); block_cleanup_push( out ); - mwait (out->i_dts + (mtime_t)i_caching); + mwait (out->i_dts + (vlc_tick_t)i_caching); vlc_cleanup_pop(); len = out->i_buffer; @@ -555,7 +555,7 @@ if (p_sys->i_total_packets > 0) quality = (float)100 - (float)100*(float)(p_sys->i_retransmit_packets) /(float)p_sys->i_total_packets; - msg_Info(p_access, "STATS: Total %u, Retransmitted %u, Link Quality %.2f%%", + msg_Info(p_access, "STATS: Total %u, Retransmitted %u, Link Quality %.2f%%", p_sys->i_total_packets, p_sys->i_retransmit_packets, quality); } p_sys->i_last_stat = now; @@ -600,7 +600,7 @@ if( !p_sys->b_mtu_warning && p_buffer->i_buffer > p_sys->i_packet_size ) { msg_Warn( p_access, "Buffer data size (%zu) > configured packet size (%zu), you " \ - "should probably increase the configured packet size", p_buffer->i_buffer, + "should probably increase the configured packet size", p_buffer->i_buffer, p_sys->i_packet_size ); p_sys->b_mtu_warning = true; } @@ -763,7 +763,7 @@ vlc_mutex_init( &p_sys->lock ); vlc_mutex_init( &p_sys->fd_lock ); - msg_Info(p_access, "Connecting RIST output to %s:%d and %s:%d", psz_dst_addr, i_dst_port, + msg_Info(p_access, "Connecting RIST output to %s:%d and %s:%d", psz_dst_addr, i_dst_port, psz_dst_addr, i_dst_port+1); p_sys->b_ismulticast = is_multicast_address(psz_dst_addr); struct rist_flow *flow = rist_udp_transmitter(p_access, psz_dst_addr, i_dst_port, @@ -783,7 +783,7 @@ p_sys->ssrc &= ~(1 << 0); msg_Info(p_access, "SSRC: 0x%08X", p_sys->ssrc); - p_sys->i_ticks_caching = RIST_TICK_FROM_MS(var_InheritInteger( p_access, + p_sys->i_ticks_caching = RIST_TICK_FROM_MS(var_InheritInteger( p_access, SOUT_CFG_PREFIX "caching")); p_sys->i_packet_size = var_InheritInteger(p_access, SOUT_CFG_PREFIX "packet-size" ); p_sys->p_fifo = block_FifoNew(); diff -Nru vlc-3.0.18/modules/access_output/shout.c vlc-3.0.20/modules/access_output/shout.c --- vlc-3.0.18/modules/access_output/shout.c 2018-02-19 15:53:40.000000000 +0000 +++ vlc-3.0.20/modules/access_output/shout.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * shout.c: This module forwards vorbis streams to an icecast server ***************************************************************************** * Copyright (C) 2005 VLC authors and VideoLAN - * $Id: fbc81a0ddd91281584373aaa062001a12b4d35b1 $ + * $Id: 0ec0c3355aa0cb4d7e0563f41eaa17776bce7dc8 $ * * Authors: Daniel Fischer * Derk-Jan Hartman @@ -462,7 +462,7 @@ /* The most common cause seems to be a server disconnect, resulting in a Socket Error which can only be fixed by closing and reconnecting. - Since we already began with a working connection, the most feasable + Since we already began with a working connection, the most feasible approach to get out of this error status is a (timed) reconnect approach. */ shout_close( p_sys->p_shout ); msg_Warn( p_access, "server unavailable? trying to reconnect..." ); diff -Nru vlc-3.0.18/modules/access_output/srt.c vlc-3.0.20/modules/access_output/srt.c --- vlc-3.0.18/modules/access_output/srt.c 2022-02-21 09:19:30.000000000 +0000 +++ vlc-3.0.20/modules/access_output/srt.c 2023-02-11 09:33:17.000000000 +0000 @@ -207,7 +207,7 @@ &(int) { SRT_EPOLL_ERR | SRT_EPOLL_OUT }); /* Schedule a connect */ - msg_Dbg( p_access, "Schedule SRT connect (dest addresss: %s, port: %d).", + msg_Dbg( p_access, "Schedule SRT connect (dest address: %s, port: %d).", psz_dst_addr, i_dst_port ); stat = srt_connect( p_sys->sock, res->ai_addr, res->ai_addrlen ); diff -Nru vlc-3.0.18/modules/access_output/udp.c vlc-3.0.20/modules/access_output/udp.c --- vlc-3.0.18/modules/access_output/udp.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/access_output/udp.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * udp.c ***************************************************************************** * Copyright (C) 2001-2007 VLC authors and VideoLAN - * $Id: 1204eab750118bee991fe9922da59fac90f05207 $ + * $Id: ea953eff349d376835ce02ee8f5d2aeec1042ef2 $ * * Authors: Laurent Aimar * Eric Petit @@ -107,11 +107,11 @@ static int Control( sout_access_out_t *, int, va_list ); static void* ThreadWrite( void * ); -static block_t *NewUDPPacket( sout_access_out_t *, mtime_t ); +static block_t *NewUDPPacket( sout_access_out_t *, vlc_tick_t ); struct sout_access_out_sys_t { - mtime_t i_caching; + vlc_tick_t i_caching; int i_handle; bool b_mtu_warning; size_t i_mtu; @@ -277,7 +277,7 @@ { block_t *p_next; int i_packets = 0; - mtime_t now = mdate(); + vlc_tick_t now = mdate(); if( !p_sys->b_mtu_warning && p_buffer->i_buffer > p_sys->i_mtu ) { @@ -352,7 +352,7 @@ /***************************************************************************** * NewUDPPacket: allocate a new UDP packet of size p_sys->i_mtu *****************************************************************************/ -static block_t *NewUDPPacket( sout_access_out_t *p_access, mtime_t i_dts) +static block_t *NewUDPPacket( sout_access_out_t *p_access, vlc_tick_t i_dts) { sout_access_out_sys_t *p_sys = p_access->p_sys; block_t *p_buffer; @@ -387,16 +387,16 @@ { sout_access_out_t *p_access = data; sout_access_out_sys_t *p_sys = p_access->p_sys; - mtime_t i_date_last = -1; + vlc_tick_t i_date_last = -1; const unsigned i_group = var_GetInteger( p_access, SOUT_CFG_PREFIX "group" ); - mtime_t i_to_send = i_group; + vlc_tick_t i_to_send = i_group; unsigned i_dropped_packets = 0; for (;;) { block_t *p_pk = block_FifoGet( p_sys->p_fifo ); - mtime_t i_date, i_sent; + vlc_tick_t i_date, i_sent; i_date = p_sys->i_caching + p_pk->i_dts; if( i_date_last > 0 ) diff -Nru vlc-3.0.18/modules/audio_filter/audiobargraph_a.c vlc-3.0.20/modules/audio_filter/audiobargraph_a.c --- vlc-3.0.18/modules/audio_filter/audiobargraph_a.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_filter/audiobargraph_a.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * audiobargraph_a.c : audiobargraph audio plugin for vlc ***************************************************************************** * Copyright (C) 2002-2014 VLC authors and VideoLAN - * $Id: bdccf32f38b5a67c5fb88eb671ed4e0783633dfc $ + * $Id: 1f787d5b78d0922421d529fbd7b07b8f461a57db $ * * Authors: Clement CHESNIN * Philippe COENT @@ -88,7 +88,7 @@ typedef struct ValueDate_t { float value; - mtime_t date; + vlc_tick_t date; struct ValueDate_t* next; } ValueDate_t; @@ -104,7 +104,7 @@ ValueDate_t* first; ValueDate_t* last; int started; - mtime_t lastAlarm; + vlc_tick_t lastAlarm; }; /***************************************************************************** diff -Nru vlc-3.0.18/modules/audio_filter/channel_mixer/spatialaudio.cpp vlc-3.0.20/modules/audio_filter/channel_mixer/spatialaudio.cpp --- vlc-3.0.18/modules/audio_filter/channel_mixer/spatialaudio.cpp 2018-03-14 22:07:38.000000000 +0000 +++ vlc-3.0.20/modules/audio_filter/channel_mixer/spatialaudio.cpp 2023-02-11 09:33:17.000000000 +0000 @@ -121,8 +121,8 @@ CAmbisonicSpeaker *speakers; std::vector inputSamples; - mtime_t i_inputPTS; - mtime_t i_last_input_pts; + vlc_tick_t i_inputPTS; + vlc_tick_t i_last_input_pts; unsigned i_order; float** inBuf; @@ -168,7 +168,7 @@ filter_spatialaudio *p_sys = reinterpret_cast(p_filter->p_sys); /* Detect discontinuity due to a pause */ - static const mtime_t rounding_error = 10; + static const vlc_tick_t rounding_error = 10; if( p_sys->i_inputPTS != 0 && p_buf->i_pts - p_sys->i_last_input_pts > rounding_error ) Flush( p_filter ); diff -Nru vlc-3.0.18/modules/audio_filter/chorus_flanger.c vlc-3.0.20/modules/audio_filter/chorus_flanger.c --- vlc-3.0.18/modules/audio_filter/chorus_flanger.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_filter/chorus_flanger.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * chorus_flanger: Basic chorus/flanger/delay audio filter ***************************************************************************** * Copyright (C) 2009-12 VLC authors and VideoLAN - * $Id: 0fe19c208f9b25753dd2994052892da74a5bf768 $ + * $Id: 776f9361359b626b512582b67e762b343d2c2aa6 $ * * Authors: Srikanth Raju < srikiraju at gmail dot com > * Sukrit Sangwan < sukritsangwan at gmail dot com > @@ -393,7 +393,7 @@ float *temp = realloc( p_sys->p_delayLineStart, p_sys->i_bufferLength ); if( unlikely( !temp ) ) { - msg_Err( p_filter, "Couldnt reallocate buffer for new delay." ); + msg_Err( p_filter, "Couldn't reallocate buffer for new delay." ); return 0; } p_sys->p_delayLineStart = temp; diff -Nru vlc-3.0.18/modules/audio_filter/converter/tospdif.c vlc-3.0.20/modules/audio_filter/converter/tospdif.c --- vlc-3.0.18/modules/audio_filter/converter/tospdif.c 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/modules/audio_filter/converter/tospdif.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * tospdif.c : encapsulates A/52 and DTS frames into S/PDIF packets ***************************************************************************** * Copyright (C) 2002, 2006-2016 VLC authors and VideoLAN - * $Id: 6013056518677bc12608ffe584a3f6dbe0efd383 $ + * $Id: 0c725d99e73333e71f56b63995e5802073be0946 $ * * Authors: Christophe Massiot * Stéphane Borel @@ -223,7 +223,7 @@ || p_in_buf->i_nb_samples != A52_FRAME_NB ) ) { /* Input is not correctly packetizer. Try to parse the buffer in order - * to get the mandatory informations to play AC3 over S/PDIF */ + * to get the mandatory information to play AC3 over S/PDIF */ vlc_a52_header_t a52; if( vlc_a52_header_Parse( &a52, p_in_buf->p_buffer, p_in_buf->i_buffer ) != VLC_SUCCESS || a52.b_eac3 || a52.i_size > p_in_buf->i_buffer ) diff -Nru vlc-3.0.18/modules/audio_filter/resampler/soxr.c vlc-3.0.20/modules/audio_filter/resampler/soxr.c --- vlc-3.0.18/modules/audio_filter/resampler/soxr.c 2020-05-10 15:23:47.000000000 +0000 +++ vlc-3.0.20/modules/audio_filter/resampler/soxr.c 2023-02-11 09:33:17.000000000 +0000 @@ -87,7 +87,7 @@ soxr_t last_soxr; double f_fixed_ratio; size_t i_last_olen; - mtime_t i_last_pts; + vlc_tick_t i_last_pts; }; static block_t *Resample( filter_t *, block_t * ); @@ -300,7 +300,7 @@ Resample( filter_t *p_filter, block_t *p_in ) { filter_sys_t *p_sys = p_filter->p_sys; - const mtime_t i_pts = p_in->i_pts; + const vlc_tick_t i_pts = p_in->i_pts; if( p_sys->vr_soxr ) { diff -Nru vlc-3.0.18/modules/audio_filter/stereo_widen.c vlc-3.0.20/modules/audio_filter/stereo_widen.c --- vlc-3.0.18/modules/audio_filter/stereo_widen.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_filter/stereo_widen.c 2023-02-11 09:33:17.000000000 +0000 @@ -232,7 +232,7 @@ if( MakeRingBuffer( &p_sys->pf_ringbuf, &p_sys->i_len, &p_sys->pf_write, newval.f_float, p_filter->fmt_in.audio.i_rate ) != VLC_SUCCESS ) { - msg_Dbg( p_filter, "Couldnt allocate buffer for delay" ); + msg_Dbg( p_filter, "Couldn't allocate buffer for delay" ); } else { diff -Nru vlc-3.0.18/modules/audio_output/Makefile.am vlc-3.0.20/modules/audio_output/Makefile.am --- vlc-3.0.18/modules/audio_output/Makefile.am 2020-07-27 08:31:07.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/Makefile.am 2023-08-05 10:03:51.000000000 +0000 @@ -110,7 +110,7 @@ libaudiounit_ios_plugin_la_SOURCES = audio_output/audiounit_ios.m \ audio_output/coreaudio_common.c audio_output/coreaudio_common.h libaudiounit_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(aoutdir)' \ - -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices,-framework,UIKit,-framework,AVFoundation + -Wl,-framework,Foundation,-framework,CoreAudio,-framework,AudioToolbox,-framework,UIKit,-framework,AVFoundation if HAVE_IOS aout_LTLIBRARIES += libaudiounit_ios_plugin.la endif diff -Nru vlc-3.0.18/modules/audio_output/alsa.c vlc-3.0.20/modules/audio_output/alsa.c --- vlc-3.0.18/modules/audio_output/alsa.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/alsa.c 2023-02-11 09:33:17.000000000 +0000 @@ -274,7 +274,7 @@ # define SetupChannels(obj, pcm, mask, tab) (0) #endif -static int TimeGet (audio_output_t *aout, mtime_t *); +static int TimeGet (audio_output_t *aout, vlc_tick_t *); static void Play (audio_output_t *, block_t *); static void Pause (audio_output_t *, bool, mtime_t); static void PauseDummy (audio_output_t *, bool, mtime_t); @@ -605,7 +605,7 @@ return VLC_EGENERIC; } -static int TimeGet (audio_output_t *aout, mtime_t *restrict delay) +static int TimeGet (audio_output_t *aout, vlc_tick_t *restrict delay) { aout_sys_t *sys = aout->sys; snd_pcm_sframes_t frames; @@ -649,7 +649,7 @@ block->i_buffer -= bytes; // pts, length } - else + else { int val = snd_pcm_recover (pcm, frames, 1); if (val) @@ -668,7 +668,7 @@ /** * Pauses/resumes the audio playback. */ -static void Pause (audio_output_t *aout, bool pause, mtime_t date) +static void Pause (audio_output_t *aout, bool pause, vlc_tick_t date) { snd_pcm_t *pcm = aout->sys->pcm; @@ -677,7 +677,7 @@ PauseDummy (aout, pause, date); } -static void PauseDummy (audio_output_t *aout, bool pause, mtime_t date) +static void PauseDummy (audio_output_t *aout, bool pause, vlc_tick_t date) { snd_pcm_t *pcm = aout->sys->pcm; diff -Nru vlc-3.0.18/modules/audio_output/amem.c vlc-3.0.20/modules/audio_output/amem.c --- vlc-3.0.18/modules/audio_output/amem.c 2020-01-13 16:36:32.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/amem.c 2023-02-11 09:33:17.000000000 +0000 @@ -91,7 +91,7 @@ block_Release (block); } -static void Pause (audio_output_t *aout, bool paused, mtime_t date) +static void Pause (audio_output_t *aout, bool paused, vlc_tick_t date) { aout_sys_t *sys = aout->sys; void (*cb) (void *, int64_t) = paused ? sys->pause : sys->resume; diff -Nru vlc-3.0.18/modules/audio_output/audiotrack.c vlc-3.0.20/modules/audio_output/audiotrack.c --- vlc-3.0.18/modules/audio_output/audiotrack.c 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/audiotrack.c 2023-02-11 09:33:17.000000000 +0000 @@ -107,18 +107,18 @@ jobject p_obj; /* AudioTimestamp ref */ jlong i_frame_us; jlong i_frame_pos; - mtime_t i_play_time; /* time when play was called */ - mtime_t i_last_time; + vlc_tick_t i_play_time; /* time when play was called */ + vlc_tick_t i_last_time; } timestamp; /* Used by AudioTrack_GetSmoothPositionUs */ struct { uint32_t i_idx; uint32_t i_count; - mtime_t p_us[SMOOTHPOS_SAMPLE_COUNT]; - mtime_t i_us; - mtime_t i_last_time; - mtime_t i_latency_us; + vlc_tick_t p_us[SMOOTHPOS_SAMPLE_COUNT]; + vlc_tick_t i_us; + vlc_tick_t i_last_time; + vlc_tick_t i_latency_us; } smoothpos; uint32_t i_max_audiotrack_samples; @@ -650,7 +650,7 @@ { aout_sys_t *p_sys = p_aout->sys; uint64_t i_audiotrack_us; - mtime_t i_now = mdate(); + vlc_tick_t i_now = mdate(); /* Fetch an AudioTrack position every SMOOTHPOS_INTERVAL_US (30ms) */ if( i_now - p_sys->smoothpos.i_last_time >= SMOOTHPOS_INTERVAL_US ) @@ -693,7 +693,7 @@ AudioTrack_GetTimestampPositionUs( JNIEnv *env, audio_output_t *p_aout ) { aout_sys_t *p_sys = p_aout->sys; - mtime_t i_now; + vlc_tick_t i_now; if( !p_sys->timestamp.p_obj ) return 0; @@ -749,10 +749,10 @@ } static int -TimeGet( audio_output_t *p_aout, mtime_t *restrict p_delay ) +TimeGet( audio_output_t *p_aout, vlc_tick_t *restrict p_delay ) { aout_sys_t *p_sys = p_aout->sys; - mtime_t i_audiotrack_us; + vlc_tick_t i_audiotrack_us; JNIEnv *env; if( p_sys->b_passthrough ) @@ -771,9 +771,9 @@ /* Debug log for both delays */ #if 0 { - mtime_t i_written_us = FRAMES_TO_US( p_sys->i_samples_written ); - mtime_t i_ts_us = AudioTrack_GetTimestampPositionUs( env, p_aout ); - mtime_t i_smooth_us = 0; + vlc_tick_t i_written_us = FRAMES_TO_US( p_sys->i_samples_written ); + vlc_tick_t i_ts_us = AudioTrack_GetTimestampPositionUs( env, p_aout ); + vlc_tick_t i_smooth_us = 0; if( i_ts_us > 0 ) i_smooth_us = AudioTrack_GetSmoothPositionUs(env, p_aout ); @@ -791,7 +791,7 @@ if( i_audiotrack_us > 0 ) { /* AudioTrack delay */ - mtime_t i_delay = FRAMES_TO_US( p_sys->i_samples_written ) + vlc_tick_t i_delay = FRAMES_TO_US( p_sys->i_samples_written ) - i_audiotrack_us; if( i_delay >= 0 ) { @@ -1732,8 +1732,8 @@ audio_output_t *p_aout = p_data; aout_sys_t *p_sys = p_aout->sys; JNIEnv *env = GET_ENV(); - mtime_t i_play_deadline = 0; - mtime_t i_last_time_blocked = 0; + vlc_tick_t i_play_deadline = 0; + vlc_tick_t i_last_time_blocked = 0; if( !env ) return NULL; @@ -1964,7 +1964,7 @@ } static void -Pause( audio_output_t *p_aout, bool b_pause, mtime_t i_date ) +Pause( audio_output_t *p_aout, bool b_pause, vlc_tick_t i_date ) { aout_sys_t *p_sys = p_aout->sys; JNIEnv *env; diff -Nru vlc-3.0.18/modules/audio_output/audiounit_ios.m vlc-3.0.20/modules/audio_output/audiounit_ios.m --- vlc-3.0.18/modules/audio_output/audiounit_ios.m 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/audiounit_ios.m 2023-04-22 23:27:28.000000000 +0000 @@ -198,7 +198,7 @@ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT); else { - const mtime_t latency_us = [p_sys->avInstance outputLatency] * CLOCK_FREQ; + const vlc_tick_t latency_us = [p_sys->avInstance outputLatency] * CLOCK_FREQ; ca_SetDeviceLatency(p_aout, latency_us); msg_Dbg(p_aout, "Current device has a new latency of %lld us", latency_us); } @@ -283,12 +283,10 @@ } static int -avas_GetOptimalChannelLayout(audio_output_t *p_aout, enum port_type *pport_type, - AudioChannelLayout **playout) +avas_GetPortType(audio_output_t *p_aout, enum port_type *pport_type) { struct aout_sys_t * p_sys = p_aout->sys; AVAudioSession *instance = p_sys->avInstance; - AudioChannelLayout *layout = NULL; *pport_type = PORT_TYPE_DEFAULT; long last_channel_count = 0; @@ -311,64 +309,11 @@ p_sys->b_spatial_audio_supported = out.spatialAudioEnabled; } - NSArray *chans = [out channels]; - - if (chans.count > last_channel_count || port_type == PORT_TYPE_HDMI) - { - /* We don't need a layout specification for stereo */ - if (chans.count > 2) - { - bool labels_valid = false; - for (AVAudioSessionChannelDescription *chan in chans) - { - if ([chan channelLabel] != kAudioChannelLabel_Unknown) - { - labels_valid = true; - break; - } - } - if (!labels_valid) - { - /* TODO: Guess labels ? */ - msg_Warn(p_aout, "no valid channel labels"); - continue; - } - - if (layout == NULL - || layout->mNumberChannelDescriptions < chans.count) - { - const size_t layout_size = sizeof(AudioChannelLayout) - + chans.count * sizeof(AudioChannelDescription); - layout = realloc_or_free(layout, layout_size); - if (layout == NULL) - return VLC_ENOMEM; - } - - layout->mChannelLayoutTag = - kAudioChannelLayoutTag_UseChannelDescriptions; - layout->mNumberChannelDescriptions = chans.count; - - unsigned i = 0; - for (AVAudioSessionChannelDescription *chan in chans) - layout->mChannelDescriptions[i++].mChannelLabel - = [chan channelLabel]; - - last_channel_count = chans.count; - } - *pport_type = port_type; - } - + *pport_type = port_type; if (port_type == PORT_TYPE_HDMI) /* Prefer HDMI */ break; } - msg_Dbg(p_aout, "Output on %s, channel count: %u, spatialAudioEnabled %i", - *pport_type == PORT_TYPE_HDMI ? "HDMI" : - *pport_type == PORT_TYPE_USB ? "USB" : - *pport_type == PORT_TYPE_HEADPHONES ? "Headphones" : "Default", - layout ? (unsigned) layout->mNumberChannelDescriptions : 2, p_sys->b_spatial_audio_supported); - - *playout = layout; return VLC_SUCCESS; } @@ -387,7 +332,7 @@ static AVAudioSessionRouteSharingPolicy GetRouteSharingPolicy(audio_output_t *p_aout) { - /* LongFormAudio by defaut */ + /* LongFormAudio by default */ AVAudioSessionRouteSharingPolicy policy = AVAudioSessionRouteSharingPolicyLongFormAudio; AVAudioSessionRouteSharingPolicy video_policy; #if !TARGET_OS_TV @@ -483,7 +428,7 @@ #pragma mark actual playback static void -Pause (audio_output_t *p_aout, bool pause, mtime_t date) +Pause (audio_output_t *p_aout, bool pause, vlc_tick_t date) { struct aout_sys_t * p_sys = p_aout->sys; @@ -649,7 +594,7 @@ } enum port_type port_type; - int ret = avas_GetOptimalChannelLayout(p_aout, &port_type, &layout); + int ret = avas_GetPortType(p_aout, &port_type); if (ret != VLC_SUCCESS) goto error; @@ -660,6 +605,21 @@ goto error; } + msg_Dbg(p_aout, "Output on %s, channel count: %ld, spatialAudioEnabled %i", + port_type == PORT_TYPE_HDMI ? "HDMI" : + port_type == PORT_TYPE_USB ? "USB" : + port_type == PORT_TYPE_HEADPHONES ? "Headphones" : "Default", + (long) [p_sys->avInstance outputNumberOfChannels], + p_sys->b_spatial_audio_supported); + + if (!p_sys->b_preferred_channels_set && fmt->i_channels > 2) + { + /* Ask the core to downmix to stereo if the preferred number of + * channels can't be set. */ + fmt->i_physical_channels = AOUT_CHANS_STEREO; + aout_FormatPrepare(fmt); + } + p_aout->current_sink_info.headphones = port_type == PORT_TYPE_HEADPHONES; p_sys->au_unit = au_NewOutputInstance(p_aout, kAudioUnitSubType_RemoteIO); @@ -673,10 +633,10 @@ if (err != noErr) ca_LogWarn("failed to set IO mode"); - const mtime_t latency_us = [p_sys->avInstance outputLatency] * CLOCK_FREQ; + const vlc_tick_t latency_us = [p_sys->avInstance outputLatency] * CLOCK_FREQ; msg_Dbg(p_aout, "Current device has a latency of %lld us", latency_us); - ret = au_Initialize(p_aout, p_sys->au_unit, fmt, layout, latency_us, NULL); + ret = au_Initialize(p_aout, p_sys->au_unit, fmt, NULL, latency_us, NULL); if (ret != VLC_SUCCESS) goto error; @@ -705,7 +665,6 @@ return VLC_SUCCESS; error: - free(layout); if (p_sys->au_unit != NULL) AudioComponentInstanceDispose(p_sys->au_unit); avas_resetPreferredNumberOfChannels(p_aout); diff -Nru vlc-3.0.18/modules/audio_output/auhal.c vlc-3.0.20/modules/audio_output/auhal.c --- vlc-3.0.18/modules/audio_output/auhal.c 2022-10-11 17:12:06.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/auhal.c 2023-02-11 09:33:17.000000000 +0000 @@ -803,7 +803,7 @@ msg_Dbg(p_aout, STREAM_FORMAT_MSG("setting stream format: ", change_format)); - /* Condition because SetProperty is asynchronious */ + /* Condition because SetProperty is asynchronous */ vlc_cond_init(&w.cond); vlc_mutex_init(&w.lock); vlc_mutex_lock(&w.lock); @@ -829,7 +829,7 @@ goto out; } - /* The AudioStreamSetProperty is not only asynchronious (requiring the + /* The AudioStreamSetProperty is not only asynchronous (requiring the * locks) it is also not atomic in its behaviour. Therefore we check 9 * times before we really give up. */ @@ -839,7 +839,7 @@ * set. */ if (i > 0) { - mtime_t timeout = mdate() + 500000; + vlc_tick_t timeout = mdate() + 500000; if (vlc_cond_timedwait(&w.cond, &w.lock, timeout)) msg_Dbg(p_aout, "reached timeout"); } @@ -1183,7 +1183,7 @@ AudioStreamBasicDescription desired_stream_format; memset(&desired_stream_format, 0, sizeof(desired_stream_format)); - /* Start doing the SPDIF setup proces */ + /* Start doing the SPDIF setup process */ p_sys->b_digital = true; /* Hog the device */ @@ -1285,7 +1285,7 @@ if (ret != VLC_SUCCESS) continue; - /* + /* * Only the first found format id is accepted. In case of * another id later on, we still use the already saved one. * This can happen if the user plugs in a spdif cable while a @@ -1603,7 +1603,7 @@ /* get device latency */ UInt32 i_latency_samples; - mtime_t i_latency_us = 0; + vlc_tick_t i_latency_us = 0; int ret = AO_GET1PROP(p_sys->i_selected_dev, UInt32, &i_latency_samples, kAudioDevicePropertyLatency, kAudioObjectPropertyScopeOutput); diff -Nru vlc-3.0.18/modules/audio_output/coreaudio_common.c vlc-3.0.20/modules/audio_output/coreaudio_common.c --- vlc-3.0.18/modules/audio_output/coreaudio_common.c 2021-07-03 10:36:52.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/coreaudio_common.c 2023-08-05 10:03:51.000000000 +0000 @@ -44,7 +44,7 @@ } static inline uint64_t -UsToFrames(struct aout_sys_common *p_sys, mtime_t i_us) +UsToFrames(struct aout_sys_common *p_sys, vlc_tick_t i_us) { return i_us * p_sys->i_rate / CLOCK_FREQ; } @@ -56,7 +56,7 @@ } static inline uint64_t -TickToHostTime(struct aout_sys_common *p_sys, mtime_t i_us) +TickToHostTime(struct aout_sys_common *p_sys, vlc_tick_t i_us) { return i_us * 1000 * p_sys->tinfo.denom / p_sys->tinfo.numer; } @@ -120,6 +120,7 @@ vlc_sem_init(&p_sys->flush_sem, 0); lock_init(p_sys); p_sys->p_out_chain = NULL; + p_sys->pp_out_last = &p_sys->p_out_chain; p_sys->chans_to_reorder = 0; p_aout->play = ca_Play; @@ -183,7 +184,7 @@ } /* Write silence to reach the first_render host time */ - const mtime_t i_silence_us = + const vlc_tick_t i_silence_us = HostTimeToTick(p_sys, p_sys->i_first_render_host_time - i_host_time); const uint64_t i_silence_bytes = @@ -256,7 +257,7 @@ } int -ca_TimeGet(audio_output_t *p_aout, mtime_t *delay) +ca_TimeGet(audio_output_t *p_aout, vlc_tick_t *delay) { struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys; @@ -269,9 +270,9 @@ return -1; } - const mtime_t i_render_time_us = + const vlc_tick_t i_render_time_us = HostTimeToTick(p_sys, p_sys->i_render_host_time); - const mtime_t i_render_delay = i_render_time_us - mdate(); + const vlc_tick_t i_render_delay = i_render_time_us - mdate(); *delay = ca_GetLatencyLocked(p_aout) + i_render_delay; lock_unlock(p_sys); @@ -296,7 +297,7 @@ /* Calculate the duration of the circular buffer, in order to wait * for the render thread to play it all */ - const mtime_t i_frame_us = + const vlc_tick_t i_frame_us = FramesToUs(p_sys, BytesToFrames(p_sys, p_sys->i_out_size)) + 10000; lock_unlock(p_sys); msleep(i_frame_us); @@ -325,7 +326,7 @@ } void -ca_Pause(audio_output_t * p_aout, bool pause, mtime_t date) +ca_Pause(audio_output_t * p_aout, bool pause, vlc_tick_t date) { struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys; VLC_UNUSED(date); @@ -354,7 +355,7 @@ * first (non-silence/zero) frame is rendered by the render callback. * Once the rendering is truly started, the date can be ignored. */ - const mtime_t first_render_time = p_block->i_pts - ca_GetLatencyLocked(p_aout); + const vlc_tick_t first_render_time = p_block->i_pts - ca_GetLatencyLocked(p_aout); p_sys->i_first_render_host_time = TickToHostTime(p_sys, first_render_time); } @@ -394,7 +395,7 @@ return; } - const mtime_t i_frame_us = + const vlc_tick_t i_frame_us = FramesToUs(p_sys, BytesToFrames(p_sys, p_block->i_buffer)); /* Wait for the render buffer to play the remaining data */ @@ -423,7 +424,7 @@ int ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt, - mtime_t i_dev_latency_us) + vlc_tick_t i_dev_latency_us) { struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys; @@ -498,7 +499,7 @@ vlc_sem_post(&p_sys->flush_sem); } -void ca_SetDeviceLatency(audio_output_t *p_aout, mtime_t i_dev_latency_us) +void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_us) { struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys; @@ -538,7 +539,7 @@ } /***************************************************************************** - * RenderCallback: This function is called everytime the AudioUnit wants + * RenderCallback: This function is called every time the AudioUnit wants * us to provide some more audio data. * Don't print anything during normal playback, calling blocking function from * this callback is not allowed. @@ -603,21 +604,86 @@ return reslayout; } +static unsigned +AudioChannelLabelToVlcChan(AudioChannelLabel chan, bool swap_rear_surround) +{ + /* maps auhal channels to vlc ones */ + switch (chan) + { + case kAudioChannelLabel_Left: + return AOUT_CHAN_LEFT; + case kAudioChannelLabel_Right: + return AOUT_CHAN_RIGHT; + case kAudioChannelLabel_Center: + return AOUT_CHAN_CENTER; + case kAudioChannelLabel_LFEScreen: + return AOUT_CHAN_LFE; + case kAudioChannelLabel_LeftSurround: + return swap_rear_surround ? AOUT_CHAN_MIDDLELEFT + : AOUT_CHAN_REARLEFT; + case kAudioChannelLabel_RightSurround: + return swap_rear_surround ? AOUT_CHAN_MIDDLERIGHT + : AOUT_CHAN_REARRIGHT; + case kAudioChannelLabel_RearSurroundLeft: + return swap_rear_surround ? AOUT_CHAN_REARLEFT + : AOUT_CHAN_MIDDLELEFT; + case kAudioChannelLabel_RearSurroundRight: + return swap_rear_surround ? AOUT_CHAN_REARRIGHT + : AOUT_CHAN_MIDDLERIGHT; + case kAudioChannelLabel_CenterSurround: + return AOUT_CHAN_REARCENTER; + case kAudioChannelLabel_LeftSurroundDirect: + return AOUT_CHAN_MIDDLELEFT; + case kAudioChannelLabel_RightSurroundDirect: + return AOUT_CHAN_MIDDLERIGHT; + default: + return 0; + } +} + +static AudioChannelLabel +VlcChanToAudioChannelLabel(unsigned chan, bool swap_rear_surround) +{ + /* maps auhal channels to vlc ones */ + switch (chan) + { + case AOUT_CHAN_LEFT: + return kAudioChannelLabel_Left; + case AOUT_CHAN_RIGHT: + return kAudioChannelLabel_Right; + case AOUT_CHAN_CENTER: + return kAudioChannelLabel_Center; + case AOUT_CHAN_LFE: + return kAudioChannelLabel_LFEScreen; + case AOUT_CHAN_REARLEFT: + return swap_rear_surround ? kAudioChannelLabel_RearSurroundLeft + : kAudioChannelLabel_LeftSurround; + case AOUT_CHAN_REARRIGHT: + return swap_rear_surround ? kAudioChannelLabel_RearSurroundRight + : kAudioChannelLabel_RightSurround; + case AOUT_CHAN_MIDDLELEFT: + return swap_rear_surround ? kAudioChannelLabel_LeftSurround + : kAudioChannelLabel_RearSurroundLeft; + case AOUT_CHAN_MIDDLERIGHT: + return swap_rear_surround ? kAudioChannelLabel_RightSurround + : kAudioChannelLabel_RearSurroundRight; + case AOUT_CHAN_REARCENTER: + return kAudioChannelLabel_CenterSurround; + default: + vlc_assert_unreachable(); + } +} + static int MapOutputLayout(audio_output_t *p_aout, audio_sample_format_t *fmt, const AudioChannelLayout *outlayout, bool *warn_configuration) { + struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys; /* Fill VLC physical_channels from output layout */ - fmt->i_physical_channels = 0; uint32_t i_original = fmt->i_physical_channels; + fmt->i_physical_channels = 0; AudioChannelLayout *reslayout = NULL; - - if (outlayout == NULL) - { - msg_Dbg(p_aout, "not output layout, default to Stereo"); - fmt->i_physical_channels = AOUT_CHANS_STEREO; - goto end; - } + assert(outlayout != NULL); if (outlayout->mChannelLayoutTag != kAudioChannelLayoutTag_UseChannelDescriptions) @@ -648,25 +714,28 @@ msg_Dbg(p_aout, "output layout of AUHAL has %i channels", outlayout->mNumberChannelDescriptions); + uint32_t chans_out[AOUT_CHAN_MAX]; - /* maps auhal channels to vlc ones */ - static const unsigned i_auhal_channel_mapping[] = { - [kAudioChannelLabel_Left] = AOUT_CHAN_LEFT, - [kAudioChannelLabel_Right] = AOUT_CHAN_RIGHT, - [kAudioChannelLabel_Center] = AOUT_CHAN_CENTER, - [kAudioChannelLabel_LFEScreen] = AOUT_CHAN_LFE, - [kAudioChannelLabel_LeftSurround] = AOUT_CHAN_REARLEFT, - [kAudioChannelLabel_RightSurround] = AOUT_CHAN_REARRIGHT, - /* needs to be swapped with rear */ - [kAudioChannelLabel_RearSurroundLeft] = AOUT_CHAN_MIDDLELEFT, - /* needs to be swapped with rear */ - [kAudioChannelLabel_RearSurroundRight] = AOUT_CHAN_MIDDLERIGHT, - [kAudioChannelLabel_CenterSurround] = AOUT_CHAN_REARCENTER - }; - static const size_t i_auhal_size = sizeof(i_auhal_channel_mapping) - / sizeof(i_auhal_channel_mapping[0]); + /* For 7.1, AOUT_CHAN_MIDDLELEFT/RIGHT needs to be swapped with + * AOUT_CHAN_REARLEFT/RIGHT. Auhal + * kAudioChannelLabel_Left/RightSurround are used as surround for 5.1, + * but as middle speakers for rear 7.1. */ + unsigned swap_rear_surround = 0; + if (outlayout->mNumberChannelDescriptions == 8) + { + for (unsigned i = 0; i < outlayout->mNumberChannelDescriptions; i++) + { + AudioChannelLabel chan = + outlayout->mChannelDescriptions[i].mChannelLabel; + if (chan == kAudioChannelLabel_RearSurroundLeft + || chan == kAudioChannelLabel_RearSurroundRight) + swap_rear_surround++; + } + if (swap_rear_surround == 2) + msg_Dbg(p_aout, "swapping Surround and RearSurround channels " + "for 7.1 Rear Surround"); + } - /* We want more than stereo and we can do that */ for (unsigned i = 0; i < outlayout->mNumberChannelDescriptions; i++) { AudioChannelLabel chan = @@ -674,11 +743,19 @@ #ifndef NDEBUG msg_Dbg(p_aout, "this is channel: %d", (int) chan); #endif - if (chan < i_auhal_size && i_auhal_channel_mapping[chan] > 0) - fmt->i_physical_channels |= i_auhal_channel_mapping[chan]; + unsigned mapped_chan = + AudioChannelLabelToVlcChan(chan, swap_rear_surround == 2); + if (mapped_chan != 0) + { + chans_out[i] = mapped_chan; + fmt->i_physical_channels |= mapped_chan; + } else + { + chans_out[i] = 0; msg_Dbg(p_aout, "found nonrecognized channel %d at index " "%d", chan, i); + } } if (fmt->i_physical_channels == 0) { @@ -686,205 +763,80 @@ if (warn_configuration) *warn_configuration = true; } - + else + { + p_sys->chans_to_reorder = + aout_CheckChannelReorder(NULL, chans_out, + fmt->i_physical_channels, + p_sys->chan_table); + if (p_sys->chans_to_reorder) + msg_Dbg(p_aout, "channel reordering needed"); + } } -end: free(reslayout); aout_FormatPrepare(fmt); - msg_Dbg(p_aout, "selected %d physical channels for device output", - aout_FormatNbChannels(fmt)); msg_Dbg(p_aout, "VLC will output: %s", aout_FormatPrintChannels(fmt)); return VLC_SUCCESS; } static int -SetupInputLayout(audio_output_t *p_aout, const audio_sample_format_t *fmt, - AudioChannelLayoutTag *inlayout_tag) +MapInputLayout(audio_output_t *p_aout, const audio_sample_format_t *fmt, + AudioChannelLayout **inlayoutp, size_t *inlayout_size) { struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys; - uint32_t chans_out[AOUT_CHAN_MAX]; + uint32_t chans_out[AOUT_CHAN_MAX] = { 0, }; - /* Some channel abbreviations used below: - * L - left - * R - right - * C - center - * Ls - left surround - * Rs - right surround - * Cs - center surround - * Rls - rear left surround - * Rrs - rear right surround - * Lw - left wide - * Rw - right wide - * Lsd - left surround direct - * Rsd - right surround direct - * Lc - left center - * Rc - right center - * Ts - top surround - * Vhl - vertical height left - * Vhc - vertical height center - * Vhr - vertical height right - * Lt - left matrix total. for matrix encoded stereo. - * Rt - right matrix total. for matrix encoded stereo. */ - - switch (aout_FormatNbChannels(fmt)) - { - case 1: - *inlayout_tag = kAudioChannelLayoutTag_Mono; - break; - case 2: - *inlayout_tag = kAudioChannelLayoutTag_Stereo; - break; - case 3: - if (fmt->i_physical_channels & AOUT_CHAN_CENTER) /* L R C */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_7; - else if (fmt->i_physical_channels & AOUT_CHAN_LFE) /* L R LFE */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_4; - break; - case 4: - if (fmt->i_physical_channels & (AOUT_CHAN_CENTER | AOUT_CHAN_LFE)) /* L R C LFE */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_10; - else if (fmt->i_physical_channels & AOUT_CHANS_REAR) /* L R Ls Rs */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_3; - else if (fmt->i_physical_channels & AOUT_CHANS_CENTER) /* L R C Cs */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_3; - break; - case 5: - if (fmt->i_physical_channels & (AOUT_CHAN_CENTER)) /* L R Ls Rs C */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_19; - else if (fmt->i_physical_channels & (AOUT_CHAN_LFE)) /* L R Ls Rs LFE */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_18; - break; - case 6: - if (fmt->i_physical_channels & (AOUT_CHAN_LFE)) - { - /* L R Ls Rs C LFE */ - *inlayout_tag = kAudioChannelLayoutTag_DVD_20; - - chans_out[0] = AOUT_CHAN_LEFT; - chans_out[1] = AOUT_CHAN_RIGHT; - chans_out[2] = AOUT_CHAN_REARLEFT; - chans_out[3] = AOUT_CHAN_REARRIGHT; - chans_out[4] = AOUT_CHAN_CENTER; - chans_out[5] = AOUT_CHAN_LFE; - - p_sys->chans_to_reorder = - aout_CheckChannelReorder(NULL, chans_out, - fmt->i_physical_channels, - p_sys->chan_table); - if (p_sys->chans_to_reorder) - msg_Dbg(p_aout, "channel reordering needed for 5.1 output"); - } - else - { - /* L R Ls Rs C Cs */ - *inlayout_tag = kAudioChannelLayoutTag_AudioUnit_6_0; - - chans_out[0] = AOUT_CHAN_LEFT; - chans_out[1] = AOUT_CHAN_RIGHT; - chans_out[2] = AOUT_CHAN_REARLEFT; - chans_out[3] = AOUT_CHAN_REARRIGHT; - chans_out[4] = AOUT_CHAN_CENTER; - chans_out[5] = AOUT_CHAN_REARCENTER; - - p_sys->chans_to_reorder = - aout_CheckChannelReorder(NULL, chans_out, - fmt->i_physical_channels, - p_sys->chan_table); - if (p_sys->chans_to_reorder) - msg_Dbg(p_aout, "channel reordering needed for 6.0 output"); - } - break; - case 7: - /* L R C LFE Ls Rs Cs */ - *inlayout_tag = kAudioChannelLayoutTag_MPEG_6_1_A; - - chans_out[0] = AOUT_CHAN_LEFT; - chans_out[1] = AOUT_CHAN_RIGHT; - chans_out[2] = AOUT_CHAN_CENTER; - chans_out[3] = AOUT_CHAN_LFE; - chans_out[4] = AOUT_CHAN_REARLEFT; - chans_out[5] = AOUT_CHAN_REARRIGHT; - chans_out[6] = AOUT_CHAN_REARCENTER; + unsigned channels = aout_FormatNbChannels(fmt); - p_sys->chans_to_reorder = - aout_CheckChannelReorder(NULL, chans_out, - fmt->i_physical_channels, - p_sys->chan_table); - if (p_sys->chans_to_reorder) - msg_Dbg(p_aout, "channel reordering needed for 6.1 output"); - - break; - case 8: - if (fmt->i_physical_channels & (AOUT_CHAN_LFE)) - { - /* L R C LFE Ls Rs Rls Rrs */ - *inlayout_tag = kAudioChannelLayoutTag_MPEG_7_1_C; - - chans_out[0] = AOUT_CHAN_LEFT; - chans_out[1] = AOUT_CHAN_RIGHT; - chans_out[2] = AOUT_CHAN_CENTER; - chans_out[3] = AOUT_CHAN_LFE; - chans_out[4] = AOUT_CHAN_MIDDLELEFT; - chans_out[5] = AOUT_CHAN_MIDDLERIGHT; - chans_out[6] = AOUT_CHAN_REARLEFT; - chans_out[7] = AOUT_CHAN_REARRIGHT; - } - else - { - /* Lc C Rc L R Ls Cs Rs */ - *inlayout_tag = kAudioChannelLayoutTag_DTS_8_0_B; - - chans_out[0] = AOUT_CHAN_MIDDLELEFT; - chans_out[1] = AOUT_CHAN_CENTER; - chans_out[2] = AOUT_CHAN_MIDDLERIGHT; - chans_out[3] = AOUT_CHAN_LEFT; - chans_out[4] = AOUT_CHAN_RIGHT; - chans_out[5] = AOUT_CHAN_REARLEFT; - chans_out[6] = AOUT_CHAN_REARCENTER; - chans_out[7] = AOUT_CHAN_REARRIGHT; - } - p_sys->chans_to_reorder = - aout_CheckChannelReorder(NULL, chans_out, - fmt->i_physical_channels, - p_sys->chan_table); - if (p_sys->chans_to_reorder) - msg_Dbg(p_aout, "channel reordering needed for 7.1 / 8.0 output"); - break; - case 9: - /* Lc C Rc L R Ls Cs Rs LFE */ - *inlayout_tag = kAudioChannelLayoutTag_DTS_8_1_B; - chans_out[0] = AOUT_CHAN_MIDDLELEFT; - chans_out[1] = AOUT_CHAN_CENTER; - chans_out[2] = AOUT_CHAN_MIDDLERIGHT; - chans_out[3] = AOUT_CHAN_LEFT; - chans_out[4] = AOUT_CHAN_RIGHT; - chans_out[5] = AOUT_CHAN_REARLEFT; - chans_out[6] = AOUT_CHAN_REARCENTER; - chans_out[7] = AOUT_CHAN_REARRIGHT; - chans_out[8] = AOUT_CHAN_LFE; - - p_sys->chans_to_reorder = - aout_CheckChannelReorder(NULL, chans_out, - fmt->i_physical_channels, - p_sys->chan_table); - if (p_sys->chans_to_reorder) - msg_Dbg(p_aout, "channel reordering needed for 8.1 output"); - break; + size_t size; + if (mul_overflow(channels, sizeof(AudioChannelDescription), &size)) + return VLC_ENOMEM; + if (add_overflow(size, sizeof(AudioChannelLayout), &size)) + return VLC_ENOMEM; + AudioChannelLayout *inlayout = malloc(size); + if (inlayout == NULL) + return VLC_ENOMEM; + + *inlayoutp = inlayout; + *inlayout_size = size; + inlayout->mChannelLayoutTag = kAudioChannelLayoutTag_UseChannelDescriptions; + inlayout->mNumberChannelDescriptions = aout_FormatNbChannels(fmt); + + bool swap_rear_surround = (fmt->i_physical_channels & AOUT_CHANS_7_0) == AOUT_CHANS_7_0; + if (swap_rear_surround) + msg_Dbg(p_aout, "swapping Surround and RearSurround channels " + "for 7.1 Rear Surround"); + unsigned chan_idx = 0; + for (unsigned i = 0; i < AOUT_CHAN_MAX; ++i) + { + unsigned vlcchan = pi_vlc_chan_order_wg4[i]; + if ((vlcchan & fmt->i_physical_channels) == 0) + continue; + + inlayout->mChannelDescriptions[chan_idx].mChannelLabel = + VlcChanToAudioChannelLabel(vlcchan, swap_rear_surround); + inlayout->mChannelDescriptions[chan_idx].mChannelFlags = + kAudioChannelFlags_AllOff; + chan_idx++; } + msg_Dbg(p_aout, "VLC keeping the same input layout"); + return VLC_SUCCESS; } int au_Initialize(audio_output_t *p_aout, AudioUnit au, audio_sample_format_t *fmt, - const AudioChannelLayout *outlayout, mtime_t i_dev_latency_us, + const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_us, bool *warn_configuration) { int ret; - AudioChannelLayoutTag inlayout_tag; + AudioChannelLayout *inlayout_buf = NULL; + const AudioChannelLayout *inlayout = NULL; + size_t inlayout_size = 0; if (warn_configuration) *warn_configuration = false; @@ -895,13 +847,20 @@ { /* PCM */ fmt->i_format = VLC_CODEC_FL32; - ret = MapOutputLayout(p_aout, fmt, outlayout, warn_configuration); - if (ret != VLC_SUCCESS) - return ret; - - ret = SetupInputLayout(p_aout, fmt, &inlayout_tag); - if (ret != VLC_SUCCESS) - return ret; + if (outlayout != NULL) + { + ret = MapOutputLayout(p_aout, fmt, outlayout, warn_configuration); + if (ret != VLC_SUCCESS) + return ret; + } + else + { + aout_FormatPrepare(fmt); + ret = MapInputLayout(p_aout, fmt, &inlayout_buf, &inlayout_size); + if (ret != VLC_SUCCESS) + return ret; + inlayout = inlayout_buf; + } desc.mFormatFlags = kAudioFormatFlagsNativeFloatPacked; desc.mChannelsPerFrame = aout_FormatNbChannels(fmt); @@ -914,7 +873,11 @@ fmt->i_bytes_per_frame = 4; fmt->i_frame_length = 1; - inlayout_tag = kAudioChannelLayoutTag_Stereo; + static const AudioChannelLayout inlayout_spdif = { + .mChannelLayoutTag = kAudioChannelLayoutTag_Stereo, + }; + inlayout = &inlayout_spdif; + inlayout_size = sizeof(inlayout_spdif); desc.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked; /* S16LE */ @@ -936,6 +899,7 @@ if (err != noErr) { ca_LogErr("failed to set stream format"); + free(inlayout_buf); return VLC_EGENERIC; } msg_Dbg(p_aout, STREAM_FORMAT_MSG("Current AU format: " , desc)); @@ -947,6 +911,7 @@ if (err != noErr) { ca_LogErr("failed to set stream format"); + free(inlayout_buf); return VLC_EGENERIC; } @@ -962,21 +927,23 @@ if (err != noErr) { ca_LogErr("failed to setup render callback"); + free(inlayout_buf); return VLC_EGENERIC; } - /* Set the input_layout as the layout VLC will use to feed the AU unit. - * Yes, it must be the INPUT scope */ - AudioChannelLayout inlayout = { - .mChannelLayoutTag = inlayout_tag, - }; - err = AudioUnitSetProperty(au, kAudioUnitProperty_AudioChannelLayout, - kAudioUnitScope_Input, 0, &inlayout, - sizeof(inlayout)); - if (err != noErr) + if (inlayout != NULL) { - ca_LogErr("failed to setup input layout"); - return VLC_EGENERIC; + /* Set the input_layout as the layout VLC will use to feed the AU unit. + * Yes, it must be the INPUT scope */ + err = AudioUnitSetProperty(au, kAudioUnitProperty_AudioChannelLayout, + kAudioUnitScope_Input, 0, inlayout, + inlayout_size); + free(inlayout_buf); + if (err != noErr) + { + ca_LogErr("failed to setup input layout"); + return VLC_EGENERIC; + } } /* AU init */ diff -Nru vlc-3.0.18/modules/audio_output/coreaudio_common.h vlc-3.0.20/modules/audio_output/coreaudio_common.h --- vlc-3.0.18/modules/audio_output/coreaudio_common.h 2020-01-13 16:36:32.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/coreaudio_common.h 2023-02-11 09:33:17.000000000 +0000 @@ -82,7 +82,7 @@ uint8_t chans_to_reorder; uint8_t chan_table[AOUT_CHAN_MAX]; /* ca_TimeGet extra latency, in micro-seconds */ - mtime_t i_dev_latency_us; + vlc_tick_t i_dev_latency_us; }; int ca_Open(audio_output_t *p_aout); @@ -92,28 +92,28 @@ void ca_Render(audio_output_t *p_aout, uint32_t i_nb_samples, uint64_t i_host_time, uint8_t *p_output, size_t i_requested); -int ca_TimeGet(audio_output_t *p_aout, mtime_t *delay); +int ca_TimeGet(audio_output_t *p_aout, vlc_tick_t *delay); void ca_Flush(audio_output_t *p_aout, bool wait); -void ca_Pause(audio_output_t * p_aout, bool pause, mtime_t date); +void ca_Pause(audio_output_t * p_aout, bool pause, vlc_tick_t date); void ca_Play(audio_output_t * p_aout, block_t * p_block); int ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt, - mtime_t i_dev_latency_us); + vlc_tick_t i_dev_latency_us); void ca_Uninitialize(audio_output_t *p_aout); void ca_SetAliveState(audio_output_t *p_aout, bool alive); -void ca_SetDeviceLatency(audio_output_t *p_aout, mtime_t i_dev_latency_us); +void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_us); AudioUnit au_NewOutputInstance(audio_output_t *p_aout, OSType comp_sub_type); int au_Initialize(audio_output_t *p_aout, AudioUnit au, audio_sample_format_t *fmt, - const AudioChannelLayout *outlayout, mtime_t i_dev_latency_us, + const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_us, bool *warn_configuration); void au_Uninitialize(audio_output_t *p_aout, AudioUnit au); diff -Nru vlc-3.0.18/modules/audio_output/directsound.c vlc-3.0.20/modules/audio_output/directsound.c --- vlc-3.0.18/modules/audio_output/directsound.c 2019-10-11 15:35:28.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/directsound.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * directsound.c: DirectSound audio output plugin for VLC ***************************************************************************** * Copyright (C) 2001-2009 VLC authors and VideoLAN - * $Id: 048d107bb17e9c67fca91f4a8e321a6ea0a8b6e6 $ + * $Id: 1e58a8531a83f8748b41556561b6c0a475b488ed $ * * Authors: Gildas Bazin * @@ -141,11 +141,11 @@ }; static HRESULT Flush( aout_stream_sys_t *sys ); -static HRESULT TimeGet( aout_stream_sys_t *sys, mtime_t *delay ) +static HRESULT TimeGet( aout_stream_sys_t *sys, vlc_tick_t *delay ) { DWORD read, status; HRESULT hr; - mtime_t size; + vlc_tick_t size; hr = IDirectSoundBuffer_GetStatus( sys->p_dsbuffer, &status ); if( hr != DS_OK ) @@ -157,7 +157,7 @@ if( hr != DS_OK ) return hr; - size = (mtime_t)read - sys->i_last_read; + size = (vlc_tick_t)read - sys->i_last_read; /* GetCurrentPosition cannot be trusted if the return doesn't change * Just return an error */ @@ -178,12 +178,12 @@ return DS_OK; } -static HRESULT StreamTimeGet( aout_stream_t *s, mtime_t *delay ) +static HRESULT StreamTimeGet( aout_stream_t *s, vlc_tick_t *delay ) { return TimeGet( s->sys, delay ); } -static int OutputTimeGet( audio_output_t *aout, mtime_t *delay ) +static int OutputTimeGet( audio_output_t *aout, vlc_tick_t *delay ) { return (TimeGet( &aout->sys->s, delay ) == DS_OK) ? 0 : -1; } @@ -333,7 +333,7 @@ return Pause( s->sys, pause ); } -static void OutputPause( audio_output_t *aout, bool pause, mtime_t date ) +static void OutputPause( audio_output_t *aout, bool pause, vlc_tick_t date ) { Pause( &aout->sys->s, pause ); (void) date; @@ -364,7 +364,7 @@ aout_sys_t *sys = aout->sys; if (drain) { /* Loosy drain emulation */ - mtime_t delay; + vlc_tick_t delay; if (OutputTimeGet(aout, &delay) == 0 && delay <= INT64_C(5000000)) Sleep((delay / (CLOCK_FREQ / 1000)) + 1); @@ -756,8 +756,8 @@ } } else - { /* Overriden speaker configuration */ - const char *name = "Non-existant"; + { /* Overridden speaker configuration */ + const char *name = "Non-existent"; switch( i ) { case 1: /* Mono */ diff -Nru vlc-3.0.18/modules/audio_output/jack.c vlc-3.0.20/modules/audio_output/jack.c --- vlc-3.0.18/modules/audio_output/jack.c 2017-12-05 10:48:05.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/jack.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * jack.c : JACK audio output module ***************************************************************************** * Copyright (C) 2006 VLC authors and VideoLAN - * $Id: 5710fed72d0c4872b106961190e4ee35dfe1f7d2 $ + * $Id: da134dc6f4c54937dd349f8d96c90a42d436c1a7 $ * * Authors: Cyril Deguet * Jon Griffiths @@ -62,7 +62,7 @@ jack_nframes_t latency; float soft_gain; bool soft_mute; - mtime_t paused; /**< Time when (last) paused */ + vlc_tick_t paused; /**< Time when (last) paused */ }; /***************************************************************************** @@ -71,9 +71,9 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Play ( audio_output_t * p_aout, block_t * p_block ); -static void Pause ( audio_output_t *aout, bool paused, mtime_t date ); +static void Pause ( audio_output_t *aout, bool paused, vlc_tick_t date ); static void Flush ( audio_output_t *p_aout, bool wait ); -static int TimeGet ( audio_output_t *, mtime_t * ); +static int TimeGet ( audio_output_t *, vlc_tick_t * ); static int Process ( jack_nframes_t i_frames, void *p_arg ); static int GraphChange ( void *p_arg ); @@ -125,7 +125,7 @@ return VLC_EGENERIC; p_sys->latency = 0; - p_sys->paused = VLC_TS_INVALID; + p_sys->paused = VLC_TICK_INVALID; /* Connect to the JACK server */ psz_name = var_InheritString( p_aout, "jack-name" ); @@ -315,7 +315,7 @@ /** * Pause or unpause playback */ -static void Pause(audio_output_t *aout, bool paused, mtime_t date) +static void Pause(audio_output_t *aout, bool paused, vlc_tick_t date) { aout_sys_t *sys = aout->sys; @@ -324,7 +324,7 @@ } else { date -= sys->paused; msg_Dbg(aout, "resuming after %"PRId64" us", date); - sys->paused = VLC_TS_INVALID; + sys->paused = VLC_TICK_INVALID; } } @@ -336,7 +336,7 @@ /* Sleep if wait was requested */ if( wait ) { - mtime_t delay; + vlc_tick_t delay; if (!TimeGet(p_aout, &delay)) msleep(delay); } @@ -345,7 +345,7 @@ jack_ringbuffer_reset(rb); } -static int TimeGet(audio_output_t *p_aout, mtime_t *delay) +static int TimeGet(audio_output_t *p_aout, vlc_tick_t *delay) { struct aout_sys_t * p_sys = p_aout->sys; jack_ringbuffer_t *rb = p_sys->p_jack_ringbuffer; @@ -371,7 +371,7 @@ /* Get the next audio data buffer unless paused */ - if( p_sys->paused == VLC_TS_INVALID ) + if( p_sys->paused == VLC_TICK_INVALID ) frames_from_rb = i_frames; /* Get the JACK buffers to write to */ diff -Nru vlc-3.0.18/modules/audio_output/kai.c vlc-3.0.20/modules/audio_output/kai.c --- vlc-3.0.18/modules/audio_output/kai.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/kai.c 2023-02-11 09:33:17.000000000 +0000 @@ -73,9 +73,9 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Play ( audio_output_t *_p_aout, block_t *block ); -static void Pause ( audio_output_t *, bool, mtime_t ); +static void Pause ( audio_output_t *, bool, vlc_tick_t ); static void Flush ( audio_output_t *, bool ); -static int TimeGet ( audio_output_t *, mtime_t *restrict ); +static int TimeGet ( audio_output_t *, vlc_tick_t *restrict ); static ULONG APIENTRY KaiCallback ( PVOID, PVOID, ULONG ); @@ -297,7 +297,7 @@ free(sys); } -static void Pause( audio_output_t *aout, bool pause, mtime_t date ) +static void Pause( audio_output_t *aout, bool pause, vlc_tick_t date ) { VLC_UNUSED( date ); @@ -329,7 +329,7 @@ vlc_mutex_unlock( &buffer->mutex ); } -static int TimeGet( audio_output_t *aout, mtime_t *restrict delay ) +static int TimeGet( audio_output_t *aout, vlc_tick_t *restrict delay ) { aout_sys_t *sys = aout->sys; audio_sample_format_t *format = &sys->format; diff -Nru vlc-3.0.18/modules/audio_output/mmdevice.c vlc-3.0.20/modules/audio_output/mmdevice.c --- vlc-3.0.18/modules/audio_output/mmdevice.c 2021-01-17 20:31:01.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/mmdevice.c 2023-08-05 10:03:51.000000000 +0000 @@ -80,6 +80,12 @@ static wchar_t default_device[1] = L""; static char default_device_b[1] = ""; +enum initialisation_status_t { + INITIALISATION_PENDING, + INITIALISATION_FAILED, + INITIALISATION_SUCCEEDED, +}; + struct aout_sys_t { aout_stream_t *stream; /**< Underlying audio output stream */ @@ -104,6 +110,7 @@ CRITICAL_SECTION lock; CONDITION_VARIABLE work; CONDITION_VARIABLE ready; + enum initialisation_status_t initialisation_status; vlc_thread_t thread; /**< Thread for audio session control */ }; @@ -130,7 +137,7 @@ } /*** VLC audio output callbacks ***/ -static int TimeGet(audio_output_t *aout, mtime_t *restrict delay) +static int TimeGet(audio_output_t *aout, vlc_tick_t *restrict delay) { aout_sys_t *sys = aout->sys; HRESULT hr; @@ -154,7 +161,7 @@ vlc_FromHR(aout, hr); } -static void Pause(audio_output_t *aout, bool paused, mtime_t date) +static void Pause(audio_output_t *aout, bool paused, vlc_tick_t date) { aout_sys_t *sys = aout->sys; HRESULT hr; @@ -858,6 +865,7 @@ } sys->requested_device = NULL; + sys->initialisation_status = INITIALISATION_SUCCEEDED; WakeConditionVariable(&sys->ready); if (SUCCEEDED(hr)) @@ -1064,12 +1072,27 @@ { audio_output_t *aout = data; aout_sys_t *sys = aout->sys; - IMMDeviceEnumerator *it = sys->it; - EnterMTA(); + /* Initialize MMDevice API */ + if (TryEnterMTA(aout)) + goto error; + + void *pv; + HRESULT hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, + &IID_IMMDeviceEnumerator, &pv); + if (FAILED(hr)) + { + msg_Dbg(aout, "cannot create device enumerator (error 0x%lX)", hr); + LeaveMTA(); + goto error; + } + + IMMDeviceEnumerator *it = pv; + sys->it = it; + IMMDeviceEnumerator_RegisterEndpointNotificationCallback(it, &sys->device_events); - HRESULT hr = DevicesEnum(it, MMThread_DevicesEnum_Added, aout); + hr = DevicesEnum(it, MMThread_DevicesEnum_Added, aout); if (FAILED(hr)) msg_Warn(aout, "cannot enumerate audio endpoints (error 0x%lx)", hr); @@ -1087,6 +1110,13 @@ IMMDeviceEnumerator_Release(it); LeaveMTA(); return NULL; + +error: + EnterCriticalSection(&sys->lock); + sys->initialisation_status = INITIALISATION_FAILED; + WakeConditionVariable(&sys->ready); + LeaveCriticalSection(&sys->lock); + return NULL; } /** @@ -1139,7 +1169,7 @@ return -1; else if (fmt->i_format == VLC_CODEC_DTS) var_SetBool(aout, "dtshd", false ); - /* falltrough */ + /* fallthrough */ case MM_PASSTHROUGH_ENABLED_HD: break; } @@ -1300,33 +1330,23 @@ sys->requested_device = default_device; } - /* Initialize MMDevice API */ - if (TryEnterMTA(aout)) - goto error; - - void *pv; - HRESULT hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, - &IID_IMMDeviceEnumerator, &pv); - if (FAILED(hr)) - { - LeaveMTA(); - msg_Dbg(aout, "cannot create device enumerator (error 0x%lx)", hr); - goto error; - } - sys->it = pv; - + sys->initialisation_status = INITIALISATION_PENDING; if (vlc_clone(&sys->thread, MMThread, aout, VLC_THREAD_PRIORITY_LOW)) { IMMDeviceEnumerator_Release(sys->it); - LeaveMTA(); goto error; } EnterCriticalSection(&sys->lock); - while (sys->requested_device != NULL) + while (sys->initialisation_status == INITIALISATION_PENDING) SleepConditionVariableCS(&sys->ready, &sys->lock, INFINITE); LeaveCriticalSection(&sys->lock); - LeaveMTA(); /* Leave MTA after thread has entered MTA */ + + if (sys->initialisation_status == INITIALISATION_FAILED) + { + vlc_join(sys->thread, NULL); + goto error; + } aout->start = Start; aout->stop = Stop; diff -Nru vlc-3.0.18/modules/audio_output/mmdevice.h vlc-3.0.20/modules/audio_output/mmdevice.h --- vlc-3.0.18/modules/audio_output/mmdevice.h 2018-04-02 16:33:04.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/mmdevice.h 2023-02-11 09:33:17.000000000 +0000 @@ -36,7 +36,7 @@ VLC_COMMON_MEMBERS void *sys; - HRESULT (*time_get)(aout_stream_t *, mtime_t *); + HRESULT (*time_get)(aout_stream_t *, vlc_tick_t *); HRESULT (*play)(aout_stream_t *, block_t *); HRESULT (*pause)(aout_stream_t *, bool); HRESULT (*flush)(aout_stream_t *); @@ -62,7 +62,7 @@ */ typedef HRESULT (*aout_stream_stop_t)(aout_stream_t *); -static inline HRESULT aout_stream_TimeGet(aout_stream_t *s, mtime_t *delay) +static inline HRESULT aout_stream_TimeGet(aout_stream_t *s, vlc_tick_t *delay) { return (s->time_get)(s, delay); } @@ -81,7 +81,7 @@ { if (wait) { /* Loosy drain emulation */ - mtime_t delay; + vlc_tick_t delay; if (SUCCEEDED(aout_stream_TimeGet(s, &delay)) && delay <= INT64_C(5000000)) diff -Nru vlc-3.0.18/modules/audio_output/opensles_android.c vlc-3.0.20/modules/audio_output/opensles_android.c --- vlc-3.0.18/modules/audio_output/opensles_android.c 2018-03-07 13:52:20.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/opensles_android.c 2023-02-11 09:33:17.000000000 +0000 @@ -182,7 +182,7 @@ aout_sys_t *sys = aout->sys; if (drain) { - mtime_t delay; + vlc_tick_t delay; if (!TimeGet(aout, &delay)) msleep(delay); } else { @@ -231,7 +231,7 @@ return (r == SL_RESULT_SUCCESS) ? 0 : -1; } -static void Pause(audio_output_t *aout, bool pause, mtime_t date) +static void Pause(audio_output_t *aout, bool pause, vlc_tick_t date) { (void)date; aout_sys_t *sys = aout->sys; diff -Nru vlc-3.0.18/modules/audio_output/oss.c vlc-3.0.20/modules/audio_output/oss.c --- vlc-3.0.18/modules/audio_output/oss.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/oss.c 2023-02-11 09:33:17.000000000 +0000 @@ -81,7 +81,7 @@ set_callbacks (Open, Close) vlc_module_end () -static int TimeGet (audio_output_t *, mtime_t *); +static int TimeGet (audio_output_t *, vlc_tick_t *); static void Play (audio_output_t *, block_t *); static void Pause (audio_output_t *, bool, mtime_t); static void Flush (audio_output_t *, bool); @@ -244,7 +244,7 @@ return VLC_EGENERIC; } -static int TimeGet (audio_output_t *aout, mtime_t *restrict pts) +static int TimeGet (audio_output_t *aout, vlc_tick_t *restrict pts) { aout_sys_t *sys = aout->sys; int delay; @@ -285,7 +285,7 @@ /** * Pauses/resumes the audio playback. */ -static void Pause (audio_output_t *aout, bool pause, mtime_t date) +static void Pause (audio_output_t *aout, bool pause, vlc_tick_t date) { aout_sys_t *sys = aout->sys; int fd = sys->fd; diff -Nru vlc-3.0.18/modules/audio_output/pulse.c vlc-3.0.20/modules/audio_output/pulse.c --- vlc-3.0.18/modules/audio_output/pulse.c 2019-08-19 06:38:03.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/pulse.c 2023-02-11 09:33:17.000000000 +0000 @@ -68,7 +68,7 @@ pa_threaded_mainloop *mainloop; /**< PulseAudio thread */ pa_time_event *trigger; /**< Deferred stream trigger */ pa_cvolume cvolume; /**< actual sink input volume */ - mtime_t first_pts; /**< Play time of buffer start */ + vlc_tick_t first_pts; /**< Play time of buffer start */ pa_volume_t volume_force; /**< Forced volume (stream must be NULL) */ pa_stream_flags_t flags_force; /**< Forced flags (stream must be NULL) */ @@ -224,9 +224,9 @@ static void stream_start(pa_stream *s, audio_output_t *aout) { aout_sys_t *sys = aout->sys; - mtime_t delta; + vlc_tick_t delta; - assert (sys->first_pts != VLC_TS_INVALID); + assert (sys->first_pts != VLC_TICK_INVALID); if (sys->trigger != NULL) { vlc_pa_rttime_free(sys->mainloop, sys->trigger); @@ -234,7 +234,7 @@ } delta = vlc_pa_get_latency(aout, sys->context, s); - if (unlikely(delta == VLC_TS_INVALID)) { + if (unlikely(delta == VLC_TICK_INVALID)) { msg_Dbg(aout, "cannot synchronize start"); delta = 0; /* screwed */ } @@ -257,7 +257,7 @@ aout_sys_t *sys = aout->sys; /* This callback is _never_ called while paused. */ - if (sys->first_pts == VLC_TS_INVALID) + if (sys->first_pts == VLC_TICK_INVALID) return; /* nothing to do if buffers are (still) empty */ if (pa_stream_is_corked(s) > 0) stream_start(s, aout); @@ -330,7 +330,7 @@ if (unlikely(op == NULL)) return; pa_operation_unref(op); - sys->first_pts = VLC_TS_INVALID; + sys->first_pts = VLC_TICK_INVALID; } static void stream_started_cb(pa_stream *s, void *userdata) @@ -438,7 +438,7 @@ /*** VLC audio output callbacks ***/ -static int TimeGet(audio_output_t *aout, mtime_t *restrict delay) +static int TimeGet(audio_output_t *aout, vlc_tick_t *restrict delay) { aout_sys_t *sys = aout->sys; pa_stream *s = sys->stream; @@ -447,8 +447,8 @@ pa_threaded_mainloop_lock(sys->mainloop); if (pa_stream_is_corked(s) <= 0) { /* latency is relevant only if not corked */ - mtime_t delta = vlc_pa_get_latency(aout, sys->context, s); - if (delta != VLC_TS_INVALID) + vlc_tick_t delta = vlc_pa_get_latency(aout, sys->context, s); + if (delta != VLC_TICK_INVALID) { *delay = delta; ret = 0; @@ -503,7 +503,7 @@ * will take place, and sooner or later a deadlock. */ pa_threaded_mainloop_lock(sys->mainloop); - if (sys->first_pts == VLC_TS_INVALID) + if (sys->first_pts == VLC_TICK_INVALID) sys->first_pts = block->i_pts; if (pa_stream_is_corked(s) > 0) @@ -528,7 +528,7 @@ /** * Cork or uncork the playback stream */ -static void Pause(audio_output_t *aout, bool paused, mtime_t date) +static void Pause(audio_output_t *aout, bool paused, vlc_tick_t date) { aout_sys_t *sys = aout->sys; pa_stream *s = sys->stream; @@ -540,7 +540,7 @@ stream_stop(s, aout); } else { pa_stream_set_latency_update_callback(s, stream_latency_cb, aout); - if (likely(sys->first_pts != VLC_TS_INVALID)) + if (likely(sys->first_pts != VLC_TICK_INVALID)) stream_start_now(s, aout); } @@ -579,7 +579,7 @@ /* XXX: Loosy drain emulation. * See #18141: drain callback is never received */ - mtime_t delay; + vlc_tick_t delay; if (TimeGet(aout, &delay) == 0 && delay <= INT64_C(5000000)) msleep(delay); } @@ -587,7 +587,7 @@ op = pa_stream_flush(s, NULL, NULL); if (op != NULL) pa_operation_unref(op); - sys->first_pts = VLC_TS_INVALID; + sys->first_pts = VLC_TICK_INVALID; stream_stop(s, aout); pa_threaded_mainloop_unlock(sys->mainloop); @@ -818,7 +818,7 @@ sys->trigger = NULL; pa_cvolume_init(&sys->cvolume); - sys->first_pts = VLC_TS_INVALID; + sys->first_pts = VLC_TICK_INVALID; pa_format_info *formatv = pa_format_info_new(); formatv->encoding = encoding; diff -Nru vlc-3.0.18/modules/audio_output/sndio.c vlc-3.0.20/modules/audio_output/sndio.c --- vlc-3.0.18/modules/audio_output/sndio.c 2021-06-07 09:25:58.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/sndio.c 2023-02-11 09:33:17.000000000 +0000 @@ -43,7 +43,7 @@ set_callbacks (Open, Close) vlc_module_end () -static int TimeGet (audio_output_t *, mtime_t *); +static int TimeGet (audio_output_t *, vlc_tick_t *); static void Play (audio_output_t *, block_t *); static void Flush (audio_output_t *, bool); static int VolumeSet (audio_output_t *, float); @@ -222,13 +222,13 @@ sys->started = 1; } -static int TimeGet (audio_output_t *aout, mtime_t *restrict delay) +static int TimeGet (audio_output_t *aout, vlc_tick_t *restrict delay) { aout_sys_t *sys = aout->sys; if (!sys->started) return -1; - *delay = (mtime_t)sys->delay * CLOCK_FREQ / sys->rate; + *delay = (vlc_tick_t)sys->delay * CLOCK_FREQ / sys->rate; return 0; } diff -Nru vlc-3.0.18/modules/audio_output/tizen_audio.c vlc-3.0.20/modules/audio_output/tizen_audio.c --- vlc-3.0.18/modules/audio_output/tizen_audio.c 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/tizen_audio.c 2023-02-11 09:33:17.000000000 +0000 @@ -297,7 +297,7 @@ } static void -Pause( audio_output_t *p_aout, bool b_pause, mtime_t i_date ) +Pause( audio_output_t *p_aout, bool b_pause, vlc_tick_t i_date ) { aout_sys_t *p_sys = p_aout->sys; (void) i_date; diff -Nru vlc-3.0.18/modules/audio_output/vlcpulse.c vlc-3.0.20/modules/audio_output/vlcpulse.c --- vlc-3.0.18/modules/audio_output/vlcpulse.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/vlcpulse.c 2023-02-11 09:33:17.000000000 +0000 @@ -250,9 +250,9 @@ #undef vlc_pa_get_latency /** * Gets latency of a PulseAudio stream. - * \return the latency or VLC_TS_INVALID on error. + * \return the latency or VLC_TICK_INVALID on error. */ -mtime_t vlc_pa_get_latency(vlc_object_t *obj, pa_context *ctx, pa_stream *s) +vlc_tick_t vlc_pa_get_latency(vlc_object_t *obj, pa_context *ctx, pa_stream *s) { /* NOTE: pa_stream_get_latency() will report 0 rather than negative latency * when the write index of a playback stream is behind its read index. @@ -268,12 +268,12 @@ if (ti == NULL) { msg_Dbg(obj, "no timing infos"); - return VLC_TS_INVALID; + return VLC_TICK_INVALID; } if (ti->write_index_corrupt) { msg_Dbg(obj, "write index corrupt"); - return VLC_TS_INVALID; + return VLC_TICK_INVALID; } pa_usec_t wt = pa_bytes_to_usec((uint64_t)ti->write_index, ss); @@ -282,7 +282,7 @@ if (pa_stream_get_time(s, &rt)) { if (pa_context_errno(ctx) != PA_ERR_NODATA) vlc_pa_error(obj, "unknown time", ctx); - return VLC_TS_INVALID; + return VLC_TICK_INVALID; } union { uint64_t u; int64_t s; } d; diff -Nru vlc-3.0.18/modules/audio_output/vlcpulse.h vlc-3.0.20/modules/audio_output/vlcpulse.h --- vlc-3.0.18/modules/audio_output/vlcpulse.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/vlcpulse.h 2023-01-01 22:21:52.000000000 +0000 @@ -34,7 +34,7 @@ VLC_API void vlc_pa_error (vlc_object_t *, const char *msg, pa_context *); #define vlc_pa_error(o, m, c) vlc_pa_error(VLC_OBJECT(o), m, c) -VLC_API mtime_t vlc_pa_get_latency (vlc_object_t *, pa_context *, pa_stream *); +VLC_API vlc_tick_t vlc_pa_get_latency (vlc_object_t *, pa_context *, pa_stream *); #define vlc_pa_get_latency(o, c, s) vlc_pa_get_latency(VLC_OBJECT(o), c, s) VLC_API void vlc_pa_rttime_free (pa_threaded_mainloop *, pa_time_event *); diff -Nru vlc-3.0.18/modules/audio_output/wasapi.c vlc-3.0.20/modules/audio_output/wasapi.c --- vlc-3.0.18/modules/audio_output/wasapi.c 2020-04-20 07:19:53.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/wasapi.c 2023-02-11 09:33:17.000000000 +0000 @@ -108,7 +108,7 @@ /*** VLC audio output callbacks ***/ -static HRESULT TimeGet(aout_stream_t *s, mtime_t *restrict delay) +static HRESULT TimeGet(aout_stream_t *s, vlc_tick_t *restrict delay) { aout_stream_sys_t *sys = s->sys; void *pv; diff -Nru vlc-3.0.18/modules/audio_output/waveout.c vlc-3.0.20/modules/audio_output/waveout.c --- vlc-3.0.18/modules/audio_output/waveout.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/waveout.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * waveout.c : Windows waveOut plugin for vlc ***************************************************************************** * Copyright (C) 2001-2009 VLC authors and VideoLAN - * $Id: 028d0833226ce69aac68509baf2cd73518c7b240 $ + * $Id: ec3a2284973cfe10f40c03354717cf0bdf8511f6 $ * * Authors: Gildas Bazin * André Weber @@ -77,7 +77,7 @@ static int ReloadWaveoutDevices( vlc_object_t *, const char *, char ***, char *** ); static uint32_t findDeviceID(char *); -static int WaveOutTimeGet(audio_output_t * , mtime_t *); +static int WaveOutTimeGet(audio_output_t * , vlc_tick_t *); static void WaveOutFlush( audio_output_t *, bool); static void WaveOutPause( audio_output_t *, bool, mtime_t); static int WaveoutVolumeSet(audio_output_t * p_aout, float volume); @@ -120,7 +120,7 @@ uint8_t chan_table[AOUT_CHAN_MAX]; vlc_fourcc_t format; - mtime_t i_played_length; + vlc_tick_t i_played_length; struct lkwavehdr * p_free_list; @@ -363,7 +363,7 @@ p_aout->sys->b_spdif ) != VLC_SUCCESS ) { - msg_Warn( p_aout, "Couln't write frame... sleeping"); + msg_Warn( p_aout, "Couldn't write frame... sleeping"); msleep( block->i_length ); } @@ -840,7 +840,7 @@ free(sys); } -static int WaveOutTimeGet(audio_output_t * p_aout, mtime_t *delay) +static int WaveOutTimeGet(audio_output_t * p_aout, vlc_tick_t *delay) { MMTIME mmtime; mmtime.wType = TIME_SAMPLES; @@ -855,7 +855,7 @@ return -1; } - mtime_t i_pos = (mtime_t) mmtime.u.sample * CLOCK_FREQ / p_aout->sys->i_rate; + vlc_tick_t i_pos = (vlc_tick_t) mmtime.u.sample * CLOCK_FREQ / p_aout->sys->i_rate; *delay = p_aout->sys->i_played_length - i_pos; return 0; } @@ -881,7 +881,7 @@ } } -static void WaveOutPause( audio_output_t * p_aout, bool pause, mtime_t date) +static void WaveOutPause( audio_output_t * p_aout, bool pause, vlc_tick_t date) { MMRESULT res; (void) date; diff -Nru vlc-3.0.18/modules/audio_output/winstore.c vlc-3.0.20/modules/audio_output/winstore.c --- vlc-3.0.18/modules/audio_output/winstore.c 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.20/modules/audio_output/winstore.c 2023-08-05 10:03:51.000000000 +0000 @@ -348,7 +348,7 @@ return SUCCEEDED(hr) ? 0 : -1; } -static int TimeGet(audio_output_t *aout, mtime_t *restrict delay) +static int TimeGet(audio_output_t *aout, vlc_tick_t *restrict delay) { aout_sys_t *sys = aout->sys; if( unlikely( sys->client == NULL ) ) @@ -366,7 +366,10 @@ { aout_sys_t *sys = aout->sys; if( unlikely( sys->client == NULL ) ) + { + block_Release(block); return; + } EnterMTA(); HRESULT hr = aout_stream_Play(sys->stream, block); @@ -375,7 +378,7 @@ ResetInvalidatedClient(aout, hr); } -static void Pause(audio_output_t *aout, bool paused, mtime_t date) +static void Pause(audio_output_t *aout, bool paused, vlc_tick_t date) { aout_sys_t *sys = aout->sys; if( unlikely( sys->client == NULL ) ) diff -Nru vlc-3.0.18/modules/codec/Makefile.am vlc-3.0.20/modules/codec/Makefile.am --- vlc-3.0.18/modules/codec/Makefile.am 2022-02-22 14:34:15.000000000 +0000 +++ vlc-3.0.20/modules/codec/Makefile.am 2023-08-05 10:03:51.000000000 +0000 @@ -62,7 +62,10 @@ libaudiotoolboxmidi_plugin_la_SOURCES = codec/audiotoolbox_midi.c libaudiotoolboxmidi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -libaudiotoolboxmidi_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,AudioUnit,-framework,AudioToolbox +libaudiotoolboxmidi_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,AudioToolbox +if HAVE_OSX +libaudiotoolboxmidi_plugin_la_LDFLAGS += -Wl,-framework,AudioUnit +endif EXTRA_LTLIBRARIES += libaudiotoolboxmidi_plugin.la codec_LTLIBRARIES += $(LTLIBaudiotoolboxmidi) @@ -347,17 +350,19 @@ packetizer/h264_slice.c packetizer/h264_slice.h \ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h +libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo if HAVE_OSX libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -mmacosx-version-min=10.8 endif if HAVE_IOS libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -miphoneos-version-min=8.0 +libvideotoolbox_plugin_la_LDFLAGS += -Wl,-framework,UIKit endif if HAVE_TVOS libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -mtvos-version-min=10.2 +libvideotoolbox_plugin_la_LDFLAGS += -Wl,-framework,UIKit endif libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la -libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo EXTRA_LTLIBRARIES += libvideotoolbox_plugin.la codec_LTLIBRARIES += $(LTLIBvideotoolbox) @@ -373,7 +378,8 @@ codec/avcodec/subtitle.c \ codec/avcodec/audio.c \ codec/avcodec/va.c codec/avcodec/va.h \ - codec/avcodec/avcodec.c codec/avcodec/avcodec.h + codec/avcodec/avcodec.c codec/avcodec/avcodec.h \ + packetizer/av1_obu.c packetizer/av1_obu.h packetizer/av1.h if ENABLE_SOUT libavcodec_plugin_la_SOURCES += codec/avcodec/encoder.c endif @@ -431,7 +437,7 @@ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h \ codec/avcodec/dxva_blacklist.c -libdxva2_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) -lshlwapi -luuid +libdxva2_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la $(LIBCOM) -lshlwapi -luuid if HAVE_AVCODEC_DXVA2 codec_LTLIBRARIES += libdxva2_plugin.la endif @@ -503,7 +509,7 @@ packetizer/hxxx_nal.h packetizer/hxxx_nal.c \ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h -libmediacodec_plugin_la_LIBADD = libchroma_copy.la +libmediacodec_plugin_la_LIBADD = libchroma_copy.la codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout) EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la if HAVE_ANDROID diff -Nru vlc-3.0.18/modules/codec/adpcm.c vlc-3.0.20/modules/codec/adpcm.c --- vlc-3.0.18/modules/codec/adpcm.c 2019-09-06 20:41:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/adpcm.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * adpcm.c : adpcm variant audio decoder ***************************************************************************** * Copyright (C) 2001, 2002 VLC authors and VideoLAN - * $Id: 26278d2d8d70e499783939b5bd96a80d5ea76a8e $ + * $Id: d79d8d708115cea64687f600eb013109ed7a5d54 $ * * Authors: Laurent Aimar * Rémi Denis-Courmont @@ -318,7 +318,7 @@ goto drop; } - if( p_block->i_pts > VLC_TS_INVALID && + if( p_block->i_pts > VLC_TICK_INVALID && p_block->i_pts != date_Get( &p_sys->end_date ) ) { date_Set( &p_sys->end_date, p_block->i_pts ); @@ -328,7 +328,7 @@ goto drop; /* Don't re-use the same pts twice */ - p_block->i_pts = VLC_TS_INVALID; + p_block->i_pts = VLC_TICK_INVALID; if( p_block->i_buffer >= p_sys->i_block ) { @@ -640,7 +640,7 @@ for( i_ch = 0; i_ch < p_dec->fmt_out.audio.i_channels; i_ch++ ) { - /* load preambule */ + /* load preamble */ channel[i_ch].i_predictor = (int16_t)((( ( p_buffer[0] << 1 )|( p_buffer[1] >> 7 ) ))<<7); channel[i_ch].i_step_index = p_buffer[1]&0x7f; diff -Nru vlc-3.0.18/modules/codec/aes3.c vlc-3.0.20/modules/codec/aes3.c --- vlc-3.0.18/modules/codec/aes3.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/aes3.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * aes3.c: aes3 decoder/packetizer module ***************************************************************************** * Copyright (C) 2008 VLC authors and VideoLAN - * $Id: cf27aed84566dc97eef343c23411bf6cf6f30805 $ + * $Id: cd6548be541b7b9959730e549d9f27336b06339d $ * * Authors: Laurent Aimar * @@ -340,7 +340,7 @@ } /* Date management */ - if( p_block->i_pts > VLC_TS_INVALID && + if( p_block->i_pts > VLC_TICK_INVALID && p_block->i_pts != date_Get( &p_sys->end_date ) ) { date_Set( &p_sys->end_date, p_block->i_pts ); diff -Nru vlc-3.0.18/modules/codec/aom.c vlc-3.0.20/modules/codec/aom.c --- vlc-3.0.18/modules/codec/aom.c 2020-04-07 13:35:05.000000000 +0000 +++ vlc-3.0.20/modules/codec/aom.c 2023-02-11 09:33:17.000000000 +0000 @@ -74,7 +74,7 @@ *****************************************************************************/ struct frame_priv_s { - mtime_t pts; + vlc_tick_t pts; }; struct decoder_sys_t @@ -150,7 +150,7 @@ { p_buffer = block->p_buffer; i_buffer = block->i_buffer; - p_sys->frame_priv[priv_index].pts = (block->i_pts != VLC_TS_INVALID) ? block->i_pts : block->i_dts; + p_sys->frame_priv[priv_index].pts = (block->i_pts != VLC_TICK_INVALID) ? block->i_pts : block->i_dts; } else { diff -Nru vlc-3.0.18/modules/codec/araw.c vlc-3.0.20/modules/codec/araw.c --- vlc-3.0.18/modules/codec/araw.c 2022-09-22 18:08:33.000000000 +0000 +++ vlc-3.0.20/modules/codec/araw.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * araw.c: Pseudo audio decoder; for raw pcm data ***************************************************************************** * Copyright (C) 2001, 2003 VLC authors and VideoLAN - * $Id: 8c56acf5a853a2b141f4fd958288606fdb1d5ac0 $ + * $Id: 5d43b6f4aaada633ad2b336034c04dc5927d052c $ * * Authors: Laurent Aimar * @@ -336,7 +336,7 @@ goto skip; } - if( p_block->i_pts > VLC_TS_INVALID && + if( p_block->i_pts > VLC_TICK_INVALID && p_block->i_pts != date_Get( &p_sys->end_date ) ) { date_Set( &p_sys->end_date, p_block->i_pts ); diff -Nru vlc-3.0.18/modules/codec/arib/substext.h vlc-3.0.20/modules/codec/arib/substext.h --- vlc-3.0.18/modules/codec/arib/substext.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/arib/substext.h 2023-02-11 09:33:17.000000000 +0000 @@ -48,7 +48,7 @@ static int SubpictureTextValidate(subpicture_t *subpic, bool has_src_changed, const video_format_t *fmt_src, bool has_dst_changed, const video_format_t *fmt_dst, - mtime_t ts) + vlc_tick_t ts) { subpicture_updater_sys_t *sys = subpic->updater.p_sys; VLC_UNUSED(fmt_src); VLC_UNUSED(fmt_dst); VLC_UNUSED(ts); @@ -63,7 +63,7 @@ static void SubpictureTextUpdate(subpicture_t *subpic, const video_format_t *fmt_src, const video_format_t *fmt_dst, - mtime_t ts) + vlc_tick_t ts) { subpicture_updater_sys_t *sys = subpic->updater.p_sys; VLC_UNUSED(fmt_src); VLC_UNUSED(ts); diff -Nru vlc-3.0.18/modules/codec/audiotoolbox_midi.c vlc-3.0.20/modules/codec/audiotoolbox_midi.c --- vlc-3.0.18/modules/codec/audiotoolbox_midi.c 2018-04-12 17:39:42.000000000 +0000 +++ vlc-3.0.20/modules/codec/audiotoolbox_midi.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * audiotoolbox_midi.c: Software MIDI synthesizer using AudioToolbox ***************************************************************************** * Copyright (C) 2017 VLC authors and VideoLAN - * $Id: 8adf545980e4ea16e5f04ebbf0da565ec1581fa5 $ + * $Id: f94e685f25ae29f1c3148d5397a774564f021dda $ * * Authors: Marvin Scholz * @@ -285,7 +285,7 @@ p_dec->pf_flush = Flush; bailout: - // Cleanup if error occured + // Cleanup if error occurred if (ret != VLC_SUCCESS) { if (p_sys->graph) DisposeAUGraph(p_sys->graph); @@ -310,7 +310,7 @@ { decoder_sys_t *p_sys = p_dec->p_sys; - date_Set(&p_sys->end_date, VLC_TS_INVALID); + date_Set(&p_sys->end_date, VLC_TICK_INVALID); // Turn all sound on all channels off // else 'old' notes could still be playing @@ -336,7 +336,7 @@ } } - if (p_block->i_pts > VLC_TS_INVALID && !date_Get(&p_sys->end_date)) { + if (p_block->i_pts > VLC_TICK_INVALID && !date_Get(&p_sys->end_date)) { date_Set(&p_sys->end_date, p_block->i_pts); } else if (p_block->i_pts < date_Get(&p_sys->end_date)) { msg_Warn(p_dec, "MIDI message in the past?"); diff -Nru vlc-3.0.18/modules/codec/avcodec/audio.c vlc-3.0.20/modules/codec/avcodec/audio.c --- vlc-3.0.18/modules/codec/avcodec/audio.c 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/audio.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * audio.c: audio decoder using libavcodec library ***************************************************************************** * Copyright (C) 1999-2003 VLC authors and VideoLAN - * $Id: 8c3fa7a2179eec3b0313d40d3f2bc46b0ce35c9c $ + * $Id: 50a76c7a18e1b0d57c87153e5ea85fca7a7c8047 $ * * Authors: Laurent Aimar * Gildas Bazin @@ -251,7 +251,7 @@ /* Try to set as much information as possible but do not trust it */ SetupOutputFormat( p_dec, false ); - date_Set( &p_sys->end_date, VLC_TS_INVALID ); + date_Set( &p_sys->end_date, VLC_TICK_INVALID ); if( !p_dec->fmt_out.audio.i_rate ) p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate; if( p_dec->fmt_out.audio.i_rate ) @@ -280,7 +280,7 @@ if( avcodec_is_open( ctx ) ) avcodec_flush_buffers( ctx ); - date_Set( &p_sys->end_date, VLC_TS_INVALID ); + date_Set( &p_sys->end_date, VLC_TICK_INVALID ); if( ctx->codec_id == AV_CODEC_ID_MP2 || ctx->codec_id == AV_CODEC_ID_MP3 ) @@ -332,11 +332,11 @@ if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY ) { - date_Set( &p_sys->end_date, VLC_TS_INVALID ); + date_Set( &p_sys->end_date, VLC_TICK_INVALID ); } /* We've just started the stream, wait for the first PTS. */ - if( !date_Get( &p_sys->end_date ) && p_block->i_pts <= VLC_TS_INVALID ) + if( !date_Get( &p_sys->end_date ) && p_block->i_pts <= VLC_TICK_INVALID ) goto drop; if( p_block->i_buffer <= 0 ) diff -Nru vlc-3.0.18/modules/codec/avcodec/avcodec.c vlc-3.0.20/modules/codec/avcodec/avcodec.c --- vlc-3.0.18/modules/codec/avcodec/avcodec.c 2018-02-01 15:59:00.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/avcodec.c 2023-08-05 10:03:51.000000000 +0000 @@ -2,7 +2,7 @@ * avcodec.c: video and audio decoder and encoder using libavcodec ***************************************************************************** * Copyright (C) 1999-2008 VLC authors and VideoLAN - * $Id: 9325b1fb0efafdaef0efd1e952cabfbb920fdfb8 $ + * $Id$ * * Authors: Laurent Aimar * Gildas Bazin @@ -86,6 +86,11 @@ set_callbacks(InitVideoDec, EndVideoDec) add_submodule() + add_shortcut("ffmpeghw") + set_capability("video decoder", 10001) + set_callbacks(InitVideoHwDec, EndVideoDec) + + add_submodule() add_shortcut("ffmpeg") set_capability("audio decoder", 70) set_callbacks(InitAudioDec, EndAudioDec) diff -Nru vlc-3.0.18/modules/codec/avcodec/avcodec.h vlc-3.0.20/modules/codec/avcodec/avcodec.h --- vlc-3.0.18/modules/codec/avcodec/avcodec.h 2018-02-01 15:59:00.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/avcodec.h 2023-08-05 10:03:51.000000000 +0000 @@ -2,7 +2,7 @@ * avcodec.h: decoder and encoder using libavcodec ***************************************************************************** * Copyright (C) 2001-2008 VLC authors and VideoLAN - * $Id: 52e522dc32198754dd45d21e2f0a5479b4ae1df0 $ + * $Id$ * * Authors: Laurent Aimar * @@ -36,6 +36,7 @@ /* Video Decoder */ int InitVideoDec( vlc_object_t * ); +int InitVideoHwDec( vlc_object_t * ); void EndVideoDec( vlc_object_t * ); /* Audio Decoder */ diff -Nru vlc-3.0.18/modules/codec/avcodec/d3d11va.c vlc-3.0.20/modules/codec/avcodec/d3d11va.c --- vlc-3.0.18/modules/codec/avcodec/d3d11va.c 2022-08-24 17:42:00.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/d3d11va.c 2023-08-05 10:03:51.000000000 +0000 @@ -55,7 +55,7 @@ #define D3D_DecoderSurface ID3D11VideoDecoderOutputView #include "directx_va.h" -static int Open(vlc_va_t *, AVCodecContext *, enum PixelFormat, +static int Open(vlc_va_t *, AVCodecContext *, const AVPixFmtDescriptor *, enum PixelFormat, const es_format_t *, picture_sys_t *p_sys); static void Close(vlc_va_t *, void **); @@ -131,7 +131,7 @@ static int DxCreateVideoService(vlc_va_t *); static void DxDestroyVideoService(vlc_va_t *); static int DxGetInputList(vlc_va_t *, input_list_t *); -static int DxSetupOutput(vlc_va_t *, const GUID *, const video_format_t *); +static int DxSetupOutput(vlc_va_t *, const GUID *, int surface_width, int surface_height); static int DxCreateDecoderSurfaces(vlc_va_t *, int codec_id, const video_format_t *fmt, unsigned surface_count); @@ -307,7 +307,8 @@ free(sys); } -static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt, +static int Open(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *desc, + enum PixelFormat pix_fmt, const es_format_t *fmt, picture_sys_t *p_sys) { int err = VLC_EGENERIC; @@ -368,6 +369,12 @@ sys->d3d_dev.d3dcontext = p_sys->context; sys->d3d_dev.owner = false; + IDXGIAdapter *adap = D3D11DeviceAdapter(sys->d3d_dev.d3ddevice); + if (adap != NULL) + { + hr = IDXGIAdapter_GetDesc(adap, &sys->d3d_dev.adapterDesc); + IDXGIAdapter_Release(adap); + } D3D11_GetDriverVersion(va, &sys->d3d_dev); sys->d3dvidctx = d3dvidctx; @@ -392,7 +399,7 @@ if (err!=VLC_SUCCESS) goto error; - err = directx_va_Setup(va, &sys->dx_sys, ctx, fmt, isXboxHardware(sys->d3d_dev.d3ddevice)); + err = directx_va_Setup(va, &sys->dx_sys, ctx, desc, fmt, isXboxHardware(&sys->d3d_dev)); if (err != VLC_SUCCESS) goto error; @@ -470,27 +477,18 @@ */ static char *DxDescribe(vlc_va_sys_t *sys) { - - IDXGIAdapter *p_adapter = D3D11DeviceAdapter(sys->d3d_dev.d3ddevice); - if (!p_adapter) { - return NULL; - } - char *description = NULL; - DXGI_ADAPTER_DESC adapterDesc; - if (SUCCEEDED(IDXGIAdapter_GetDesc(p_adapter, &adapterDesc))) { - char *utfdesc = FromWide(adapterDesc.Description); - if (likely(utfdesc!=NULL)) - { - if (asprintf(&description, "D3D11VA (%s, vendor %x(%s), device %x, revision %x)", - utfdesc, - adapterDesc.VendorId, DxgiVendorStr(adapterDesc.VendorId), adapterDesc.DeviceId, adapterDesc.Revision) < 0) - description = NULL; - free(utfdesc); - } + char *utfdesc = FromWide(sys->d3d_dev.adapterDesc.Description); + if (likely(utfdesc!=NULL)) + { + if (asprintf(&description, "D3D11VA (%s, vendor %x(%s), device %x, revision %x)", + utfdesc, + sys->d3d_dev.adapterDesc.VendorId, DxgiVendorStr(sys->d3d_dev.adapterDesc.VendorId), + sys->d3d_dev.adapterDesc.DeviceId, sys->d3d_dev.adapterDesc.Revision) < 0) + description = NULL; + free(utfdesc); } - IDXGIAdapter_Release(p_adapter); return description; } @@ -557,7 +555,7 @@ extern const GUID DXVA_ModeHEVC_VLD_Main10; extern const GUID DXVA_ModeVP9_VLD_10bit_Profile2; -static int DxSetupOutput(vlc_va_t *va, const GUID *input, const video_format_t *fmt) +static int DxSetupOutput(vlc_va_t *va, const GUID *input, int surface_width, int surface_height) { vlc_va_sys_t *sys = va->sys; directx_sys_t *dx_sys = &sys->dx_sys; @@ -572,19 +570,9 @@ } #endif - IDXGIAdapter *pAdapter = D3D11DeviceAdapter(sys->d3d_dev.d3ddevice); - if (!pAdapter) - return VLC_EGENERIC; - - DXGI_ADAPTER_DESC adapterDesc; - hr = IDXGIAdapter_GetDesc(pAdapter, &adapterDesc); - IDXGIAdapter_Release(pAdapter); - if (FAILED(hr)) - return VLC_EGENERIC; - char *psz_decoder_name = directx_va_GetDecoderName(input); - if (!directx_va_canUseDecoder(va, adapterDesc.VendorId, adapterDesc.DeviceId, + if (!directx_va_canUseDecoder(va, sys->d3d_dev.adapterDesc.VendorId, sys->d3d_dev.adapterDesc.DeviceId, input, sys->d3d_dev.WDDM.build)) { msg_Warn(va, "GPU blacklisted for %s codec", psz_decoder_name); @@ -637,8 +625,8 @@ D3D11_VIDEO_DECODER_DESC decoderDesc; ZeroMemory(&decoderDesc, sizeof(decoderDesc)); decoderDesc.Guid = *input; - decoderDesc.SampleWidth = fmt->i_width; - decoderDesc.SampleHeight = fmt->i_height; + decoderDesc.SampleWidth = surface_width; + decoderDesc.SampleHeight = surface_height; decoderDesc.OutputFormat = processorInput[idx]; UINT cfg_count = 0; @@ -673,21 +661,11 @@ return VLC_EGENERIC; } -static bool CanUseDecoderPadding(vlc_va_sys_t *sys) +static bool CanUseDecoderPadding(const vlc_va_sys_t *sys) { - IDXGIAdapter *pAdapter = D3D11DeviceAdapter(sys->d3d_dev.d3ddevice); - if (!pAdapter) - return false; - - DXGI_ADAPTER_DESC adapterDesc; - HRESULT hr = IDXGIAdapter_GetDesc(pAdapter, &adapterDesc); - IDXGIAdapter_Release(pAdapter); - if (FAILED(hr)) - return false; - /* Qualcomm hardware has issues with textures and pixels that should not be * part of the decoded area */ - return adapterDesc.VendorId != GPU_MANUFACTURER_QUALCOMM; + return sys->d3d_dev.adapterDesc.VendorId != GPU_MANUFACTURER_QUALCOMM; } /** @@ -733,7 +711,7 @@ * crashes totally the device */ if (codec_id == AV_CODEC_ID_H264 && (sys->textureWidth > 2304 || sys->textureHeight > 2304) && - isXboxHardware(sys->d3d_dev.d3ddevice)) + isXboxHardware(&sys->d3d_dev)) { msg_Warn(va, "%dx%d resolution not supported by your hardware", fmt->i_width, fmt->i_height); return VLC_EGENERIC; diff -Nru vlc-3.0.18/modules/codec/avcodec/directx_va.c vlc-3.0.20/modules/codec/avcodec/directx_va.c --- vlc-3.0.18/modules/codec/avcodec/directx_va.c 2021-07-03 10:36:52.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/directx_va.c 2023-08-05 10:03:51.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright (C) 2009 Geoffroy Couprie * Copyright (C) 2009 Laurent Aimar * Copyright (C) 2015 Steve Lhomme - * $Id: fc98a48060a5dc610b836b151591b5cb40516199 $ + * $Id$ * * Authors: Geoffroy Couprie * Laurent Aimar @@ -65,6 +65,9 @@ static const int PROF_VP9_MAIN[] = { FF_PROFILE_VP9_0, FF_PROFILE_UNKNOWN }; static const int PROF_VP9_10[] = { FF_PROFILE_VP9_2, FF_PROFILE_UNKNOWN }; +static const int PROF_AV1_MAIN[] = { FF_PROFILE_AV1_MAIN, FF_PROFILE_UNKNOWN }; +static const int PROF_AV1_HIGH[] = { FF_PROFILE_AV1_HIGH, FF_PROFILE_AV1_MAIN, FF_PROFILE_UNKNOWN }; + #include #if defined(WINAPI_FAMILY) # undef WINAPI_FAMILY @@ -166,115 +169,139 @@ DEFINE_GUID(DXVA_ModeVP9_VLD_10bit_Profile2, 0xa4c749ef, 0x6ecf, 0x48aa, 0x84, 0x48, 0x50, 0xa7, 0xa1, 0x16, 0x5f, 0xf7); DEFINE_GUID(DXVA_ModeVP9_VLD_Intel, 0x76988a52, 0xdf13, 0x419a, 0x8e, 0x64, 0xff, 0xcf, 0x4a, 0x33, 0x6c, 0xf5); +#ifndef _DIRECTX_AV1_VA_ +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); +#endif + typedef struct { const char *name; const GUID *guid; + int bit_depth; enum AVCodecID codec; const int *p_profiles; // NULL or ends with 0 } directx_va_mode_t; -/* XXX Prefered modes must come first */ +/* XXX Preferred modes must come first */ static const directx_va_mode_t DXVA_MODES[] = { /* MPEG-1/2 */ - { "MPEG-1 decoder, restricted profile A", &DXVA_ModeMPEG1_A, 0, NULL }, - { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 0, NULL }, - { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 0, NULL }, - { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 0, NULL }, - { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 0, NULL }, - - { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN }, - { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN }, - { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG1VIDEO, NULL }, - { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0, NULL }, - { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 0, NULL }, + { "MPEG-1 decoder, restricted profile A", &DXVA_ModeMPEG1_A, 8, 0, NULL }, + { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 8, 0, NULL }, + { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 8, 0, NULL }, + { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 8, 0, NULL }, + { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 8, 0, NULL }, + + { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, 8, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN }, + { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, 8, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN }, + { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, 8, AV_CODEC_ID_MPEG1VIDEO, NULL }, + { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 8, 0, NULL }, + { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 8, 0, NULL }, /* MPEG-1 http://download.microsoft.com/download/B/1/7/B172A3C8-56F2-4210-80F1-A97BEA9182ED/DXVA_MPEG1_VLD.pdf */ - { "MPEG-1 variable-length decoder, no D pictures", &DXVA2_ModeMPEG1_VLD, 0, NULL }, + { "MPEG-1 variable-length decoder, no D pictures", &DXVA2_ModeMPEG1_VLD, 8, 0, NULL }, /* H.264 http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=3d1c290b-310b-4ea2-bf76-714063a6d7a6 */ - { "H.264 variable-length decoder, film grain technology", &DXVA2_ModeH264_F, AV_CODEC_ID_H264, PROF_H264_HIGH }, - { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, AV_CODEC_ID_H264, PROF_H264_HIGH }, - { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVA_Intel_H264_NoFGT_ClearVideo, AV_CODEC_ID_H264, PROF_H264_HIGH }, - { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, AV_CODEC_ID_H264, PROF_H264_HIGH }, - { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, AV_CODEC_ID_H264, PROF_H264_HIGH }, - - { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 0, NULL }, - { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 0, NULL }, - { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 0, NULL }, - - { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 0, NULL }, - { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 0, NULL }, - { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 0, NULL }, + { "H.264 variable-length decoder, film grain technology", &DXVA2_ModeH264_F, 8, AV_CODEC_ID_H264, PROF_H264_HIGH }, + { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, 8, AV_CODEC_ID_H264, PROF_H264_HIGH }, + { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVA_Intel_H264_NoFGT_ClearVideo, 8, AV_CODEC_ID_H264, PROF_H264_HIGH }, + { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 8, AV_CODEC_ID_H264, PROF_H264_HIGH }, + { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, 8, AV_CODEC_ID_H264, PROF_H264_HIGH }, + + { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 8, 0, NULL }, + { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 8, 0, NULL }, + { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 8, 0, NULL }, + + { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 8, 0, NULL }, + { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 8, 0, NULL }, + { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 8, 0, NULL }, /* http://download.microsoft.com/download/2/D/0/2D02E72E-7890-430F-BA91-4A363F72F8C8/DXVA_H264_MVC.pdf */ - { "H.264 stereo high profile, mbs flag set", &DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 0, NULL }, - { "H.264 stereo high profile", &DXVA_ModeH264_VLD_Stereo_NoFGT, 0, NULL }, - { "H.264 multiview high profile", &DXVA_ModeH264_VLD_Multiview_NoFGT, 0, NULL }, + { "H.264 stereo high profile, mbs flag set", &DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 8, 0, NULL }, + { "H.264 stereo high profile", &DXVA_ModeH264_VLD_Stereo_NoFGT, 8, 0, NULL }, + { "H.264 multiview high profile", &DXVA_ModeH264_VLD_Multiview_NoFGT, 8, 0, NULL }, /* SVC http://download.microsoft.com/download/C/8/A/C8AD9F1B-57D1-4C10-85A0-09E3EAC50322/DXVA_SVC_2012_06.pdf */ - { "H.264 scalable video coding, Scalable Baseline Profile", &DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 0, NULL }, - { "H.264 scalable video coding, Scalable Constrained Baseline Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0, NULL }, - { "H.264 scalable video coding, Scalable High Profile", &DXVA_ModeH264_VLD_SVC_Scalable_High, 0, NULL }, - { "H.264 scalable video coding, Scalable Constrained High Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 0, NULL }, + { "H.264 scalable video coding, Scalable Baseline Profile", &DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 8, 0, NULL }, + { "H.264 scalable video coding, Scalable Constrained Baseline Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 8, 0, NULL }, + { "H.264 scalable video coding, Scalable High Profile", &DXVA_ModeH264_VLD_SVC_Scalable_High, 8, 0, NULL }, + { "H.264 scalable video coding, Scalable Constrained High Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 8, 0, NULL }, /* WMV */ - { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 0, NULL }, - { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 0, NULL }, + { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 8, 0, NULL }, + { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 8, 0, NULL }, - { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0, NULL }, - { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 0, NULL }, - { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0, NULL }, + { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 8, 0, NULL }, + { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 8, 0, NULL }, + { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 8, 0, NULL }, /* VC-1 */ - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1, NULL }, - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3, NULL }, - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_VC1, NULL }, - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_WMV3, NULL }, - { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0, NULL }, - { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0, NULL }, - - { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 0, NULL }, - { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 0, NULL }, - { "VC-1 post processing", &DXVA2_ModeVC1_A, 0, NULL }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, 8, AV_CODEC_ID_VC1, NULL }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, 8, AV_CODEC_ID_WMV3, NULL }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, 8, AV_CODEC_ID_VC1, NULL }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, 8, AV_CODEC_ID_WMV3, NULL }, + { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 8, 0, NULL }, + { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 8, 0, NULL }, + + { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 8, 0, NULL }, + { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 8, 0, NULL }, + { "VC-1 post processing", &DXVA2_ModeVC1_A, 8, 0, NULL }, /* Xvid/Divx: TODO */ - { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 0, NULL }, - { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 0, NULL }, - { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0, NULL }, - { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0, NULL }, - { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, Avivo", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 0, NULL }, + { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 8, 0, NULL }, + { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 8, 0, NULL }, + { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 8, 0, NULL }, + { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 8, 0, NULL }, + { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, Avivo", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 8, 0, NULL }, /* HEVC */ - { "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN }, - { "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10 }, + { "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, 8, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN }, + { "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, 10, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10 }, /* H.261 */ - { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 0, NULL }, - { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 0, NULL }, + { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 8, 0, NULL }, + { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 8, 0, NULL }, /* H.263 */ - { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 0, NULL }, - { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 0, NULL }, - { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 0, NULL }, - { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 0, NULL }, - { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 0, NULL }, - { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 0, NULL }, + { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 8, 0, NULL }, + { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 8, 0, NULL }, + { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 8, 0, NULL }, + { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 8, 0, NULL }, + { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 8, 0, NULL }, + { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 8, 0, NULL }, /* VPx */ - { "VP8", &DXVA_ModeVP8_VLD, 0, NULL }, + { "VP8", &DXVA_ModeVP8_VLD, 8, 0, NULL }, #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100 - { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, AV_CODEC_ID_VP9, PROF_VP9_MAIN }, - { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, AV_CODEC_ID_VP9, PROF_VP9_10 }, + { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, AV_CODEC_ID_VP9, PROF_VP9_MAIN }, + { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, AV_CODEC_ID_VP9, PROF_VP9_10 }, +#else + { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, 0, NULL }, + { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, 0, NULL }, +#endif + { "VP9 profile Intel", &DXVA_ModeVP9_VLD_Intel, 8, 0, NULL }, + + /* AV1 */ +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 58, 112, 103 ) && LIBAVCODEC_VERSION_MICRO >= 100 + { "AV1 Main profile 8", &DXVA_ModeAV1_VLD_Profile0, 8, AV_CODEC_ID_AV1, PROF_AV1_MAIN }, + { "AV1 Main profile 10", &DXVA_ModeAV1_VLD_Profile0, 10, AV_CODEC_ID_AV1, PROF_AV1_MAIN }, + { "AV1 High profile 8", &DXVA_ModeAV1_VLD_Profile1, 8, AV_CODEC_ID_AV1, PROF_AV1_HIGH }, + { "AV1 High profile 10", &DXVA_ModeAV1_VLD_Profile1, 10, AV_CODEC_ID_AV1, PROF_AV1_HIGH }, #else - { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 0, NULL }, - { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 0, NULL }, + { "AV1 Main profile 8", &DXVA_ModeAV1_VLD_Profile0, 8, 0, NULL }, + { "AV1 Main profile 10", &DXVA_ModeAV1_VLD_Profile0, 10, 0, NULL }, + { "AV1 High profile 8", &DXVA_ModeAV1_VLD_Profile1, 8, 0, NULL }, + { "AV1 High profile 10", &DXVA_ModeAV1_VLD_Profile1, 10, 0, NULL }, #endif - { "VP9 profile Intel", &DXVA_ModeVP9_VLD_Intel, 0, NULL }, - { NULL, NULL, 0, NULL } + { NULL, NULL, 0, 0, NULL } }; -static int FindVideoServiceConversion(vlc_va_t *, directx_sys_t *, const es_format_t *, const AVCodecContext *); +static int FindVideoServiceConversion(vlc_va_t *, directx_sys_t *, const es_format_t *, + const AVCodecContext *, const AVPixFmtDescriptor *, + int surface_width, int surface_height); char *directx_va_GetDecoderName(const GUID *guid) { @@ -290,15 +317,10 @@ } /* */ -int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, const AVCodecContext *avctx, +int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, + const AVCodecContext *avctx, const AVPixFmtDescriptor *desc, const es_format_t *fmt, int flag_xbox) { - /* */ - if (FindVideoServiceConversion(va, dx_sys, fmt, avctx)) { - msg_Err(va, "FindVideoServiceConversion failed"); - return VLC_EGENERIC; - } - int surface_alignment = 16; unsigned surface_count = 2; @@ -327,6 +349,10 @@ case AV_CODEC_ID_VP9: surface_count += 4; break; + case AV_CODEC_ID_AV1: + surface_alignment = 128; + surface_count += 8 + 1; + break; default: surface_count += 2; } @@ -334,7 +360,26 @@ if ( avctx->active_thread_type & FF_THREAD_FRAME ) surface_count += avctx->thread_count; - int err = va_pool_SetupDecoder(va, &dx_sys->va_pool, avctx, surface_count, surface_alignment); + if (avctx->coded_width <= 0 || avctx->coded_height <= 0) + return VLC_EGENERIC; + + assert((surface_alignment & (surface_alignment - 1)) == 0); /* power of 2 */ +#define ALIGN(x, y) (((x) + ((y) - 1)) & ~((y) - 1)) + int surface_width = ALIGN(avctx->coded_width, surface_alignment); + int surface_height = ALIGN(avctx->coded_height, surface_alignment); + + if (avctx->coded_width != surface_width || avctx->coded_height != surface_height) + msg_Warn( va, "surface dimensions (%dx%d) differ from avcodec dimensions (%dx%d)", + surface_width, surface_height, + avctx->coded_width, avctx->coded_height); + + /* */ + if (FindVideoServiceConversion(va, dx_sys, fmt, avctx, desc, surface_width, surface_height)) { + msg_Err(va, "FindVideoServiceConversion failed"); + return VLC_EGENERIC; + } + + int err = va_pool_SetupDecoder(va, &dx_sys->va_pool, avctx, surface_count, surface_width, surface_height); if (err != VLC_SUCCESS) return err; if (dx_sys->can_extern_pool) @@ -361,32 +406,32 @@ static bool profile_supported(const directx_va_mode_t *mode, const es_format_t *fmt, const AVCodecContext *avctx) { - bool is_supported = mode->p_profiles == NULL; - if (!is_supported) + if (mode->p_profiles == NULL) + return true; + + int profile = fmt->i_profile >= 0 ? fmt->i_profile : avctx->profile; + if (mode->codec == AV_CODEC_ID_H264 && profile == -1) { - int profile = fmt->i_profile >= 0 ? fmt->i_profile : avctx->profile; - if (mode->codec == AV_CODEC_ID_H264 && profile == -1) - { - uint8_t h264_profile; - if ( h264_get_profile_level(fmt, &h264_profile, NULL, NULL) ) - profile = h264_profile; - } - if (mode->codec == AV_CODEC_ID_HEVC && profile == -1) - { - uint8_t hevc_profile; - if (hevc_get_profile_level(fmt, &hevc_profile, NULL, NULL) ) - profile = hevc_profile; - } + uint8_t h264_profile; + if ( h264_get_profile_level(fmt, &h264_profile, NULL, NULL) ) + profile = h264_profile; + } + if (mode->codec == AV_CODEC_ID_HEVC && profile == -1) + { + uint8_t hevc_profile; + if (hevc_get_profile_level(fmt, &hevc_profile, NULL, NULL) ) + profile = hevc_profile; + } - if (profile <= 0) - is_supported = true; - else for (const int *p_profile = &mode->p_profiles[0]; *p_profile != FF_PROFILE_UNKNOWN; ++p_profile) + bool is_supported = false; + if (profile <= 0) + is_supported = true; + else for (const int *p_profile = &mode->p_profiles[0]; *p_profile != FF_PROFILE_UNKNOWN; ++p_profile) + { + if (*p_profile == profile) { - if (*p_profile == profile) - { - is_supported = true; - break; - } + is_supported = true; + break; } } return is_supported; @@ -396,7 +441,9 @@ * Find the best suited decoder mode GUID and render format. */ static int FindVideoServiceConversion(vlc_va_t *va, directx_sys_t *dx_sys, - const es_format_t *fmt, const AVCodecContext *avctx) + const es_format_t *fmt, + const AVCodecContext *avctx, const AVPixFmtDescriptor *desc, + int surface_width, int surface_height) { input_list_t p_list = { 0 }; int err = dx_sys->pf_get_input_list(va, &p_list); @@ -408,7 +455,7 @@ } err = VLC_EGENERIC; - /* Retreive supported modes from the decoder service */ + /* Retrieve supported modes from the decoder service */ for (unsigned i = 0; i < p_list.count; i++) { const GUID *g = &p_list.list[i]; char *psz_decoder_name = directx_va_GetDecoderName(g); @@ -427,23 +474,31 @@ for (const GUID *g = &p_list.list[0]; !is_supported && g < &p_list.list[p_list.count]; g++) { is_supported = IsEqualGUID(mode->guid, g); } - if ( is_supported ) + if ( !is_supported ) + continue; + + int src_bit_depth = (desc && desc->nb_components) ? desc->comp[0].depth : 8; + if (src_bit_depth != mode->bit_depth) { - is_supported = profile_supported( mode, fmt, avctx ); - if (!is_supported) - { - char *psz_name = directx_va_GetDecoderName(mode->guid); - msg_Warn( va, "Unsupported profile %d for %s ", - fmt->i_profile, psz_name ); - free( psz_name ); - } + char *psz_name = directx_va_GetDecoderName(mode->guid); + msg_Warn( va, "Unsupported bitdepth %d for %s ", + src_bit_depth, psz_name ); + free( psz_name ); + continue; } - if (!is_supported) + + if (!profile_supported( mode, fmt, avctx )) + { + char *psz_name = directx_va_GetDecoderName(mode->guid); + msg_Warn( va, "Unsupported profile %d for %s ", + fmt->i_profile, psz_name ); + free( psz_name ); continue; + } /* */ msg_Dbg(va, "Trying to use '%s' as input", mode->name); - if (dx_sys->pf_setup_output(va, mode->guid, &fmt->video)==VLC_SUCCESS) + if (dx_sys->pf_setup_output(va, mode->guid, surface_width, surface_height)==VLC_SUCCESS) { dx_sys->input = *mode->guid; err = VLC_SUCCESS; diff -Nru vlc-3.0.18/modules/codec/avcodec/directx_va.h vlc-3.0.20/modules/codec/avcodec/directx_va.h --- vlc-3.0.18/modules/codec/avcodec/directx_va.h 2020-04-20 07:19:53.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/directx_va.h 2023-08-05 10:03:51.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright (C) 2009 Geoffroy Couprie * Copyright (C) 2009 Laurent Aimar * Copyright (C) 2015 Steve Lhomme - * $Id: 6b66979e0195651bc55afd94578b1843cb58f663 $ + * $Id$ * * Authors: Geoffroy Couprie * Laurent Aimar @@ -74,13 +74,14 @@ * Find a suitable decoder configuration for the input and set the * internal state to use that output */ - int (*pf_setup_output)(vlc_va_t *, const GUID *input, const video_format_t *fmt); + int (*pf_setup_output)(vlc_va_t *, const GUID *input, int surface_width, int surface_height); } directx_sys_t; int directx_va_Open(vlc_va_t *, directx_sys_t *); void directx_va_Close(vlc_va_t *, directx_sys_t *); -int directx_va_Setup(vlc_va_t *, directx_sys_t *, const AVCodecContext *avctx, const es_format_t *, int flag_xbox); +int directx_va_Setup(vlc_va_t *, directx_sys_t *, const AVCodecContext *, const AVPixFmtDescriptor *, + const es_format_t *, int flag_xbox); char *directx_va_GetDecoderName(const GUID *guid); bool directx_va_canUseDecoder(vlc_va_t *, UINT VendorId, UINT DeviceId, const GUID *pCodec, UINT driverBuild); diff -Nru vlc-3.0.18/modules/codec/avcodec/dxva2.c vlc-3.0.20/modules/codec/avcodec/dxva2.c --- vlc-3.0.18/modules/codec/avcodec/dxva2.c 2018-10-28 11:11:19.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/dxva2.c 2023-08-05 10:03:51.000000000 +0000 @@ -3,7 +3,7 @@ ***************************************************************************** * Copyright (C) 2009 Geoffroy Couprie * Copyright (C) 2009 Laurent Aimar - * $Id: 6116fa3e21b812caff8b3c65e5f2a1c4cadacc4d $ + * $Id: 26cb48dc887acd90eba53d9a30d60a3cbed212d9 $ * * Authors: Geoffroy Couprie * Laurent Aimar @@ -43,7 +43,7 @@ #define D3D_DecoderSurface IDirect3DSurface9 #include "directx_va.h" -static int Open(vlc_va_t *, AVCodecContext *, enum PixelFormat, +static int Open(vlc_va_t *, AVCodecContext *, const AVPixFmtDescriptor *, enum PixelFormat, const es_format_t *, picture_sys_t *p_sys); static void Close(vlc_va_t *, void **); @@ -82,13 +82,7 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6); -/* */ -typedef struct { - const char *name; - D3DFORMAT format; - vlc_fourcc_t codec; -} d3d9_format_t; -/* XXX Prefered format must come first */ +/* XXX Preferred format must come first */ static const d3d9_format_t d3d_formats[] = { { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, @@ -144,7 +138,7 @@ static int DxCreateVideoService(vlc_va_t *); static void DxDestroyVideoService(vlc_va_t *); static int DxGetInputList(vlc_va_t *, input_list_t *); -static int DxSetupOutput(vlc_va_t *, const GUID *, const video_format_t *); +static int DxSetupOutput(vlc_va_t *, const GUID *, int surface_width, int surface_height); static int DxCreateVideoDecoder(vlc_va_t *, int codec_id, const video_format_t *, unsigned surface_count); @@ -254,7 +248,8 @@ free(sys); } -static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt, +static int Open(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *desc, + enum PixelFormat pix_fmt, const es_format_t *fmt, picture_sys_t *p_sys) { int err = VLC_EGENERIC; @@ -315,7 +310,7 @@ if (err!=VLC_SUCCESS) goto error; - err = directx_va_Setup(va, &sys->dx_sys, ctx, fmt, 0); + err = directx_va_Setup(va, &sys->dx_sys, ctx, desc, fmt, 0); if (err != VLC_SUCCESS) goto error; @@ -495,23 +490,19 @@ return VLC_SUCCESS; } -static int DxSetupOutput(vlc_va_t *va, const GUID *input, const video_format_t *fmt) +static int DxSetupOutput(vlc_va_t *va, const GUID *input, int surface_width, int surface_height) { - VLC_UNUSED(fmt); + VLC_UNUSED(surface_width); VLC_UNUSED(surface_height); vlc_va_sys_t *sys = va->sys; - D3DADAPTER_IDENTIFIER9 identifier; - HRESULT hr = IDirect3D9_GetAdapterIdentifier(sys->hd3d.obj, sys->d3d_dev.adapterId, 0, &identifier); - if (FAILED(hr)) - return VLC_EGENERIC; - - UINT driverBuild = identifier.DriverVersion.LowPart & 0xFFFF; - if (identifier.VendorId == GPU_MANUFACTURER_INTEL && (identifier.DriverVersion.LowPart >> 16) >= 100) + const D3DADAPTER_IDENTIFIER9 *identifier = &sys->d3d_dev.identifier; + UINT driverBuild = identifier->DriverVersion.LowPart & 0xFFFF; + if (identifier->VendorId == GPU_MANUFACTURER_INTEL && (identifier->DriverVersion.LowPart >> 16) >= 100) { /* new Intel driver format */ - driverBuild += ((identifier.DriverVersion.LowPart >> 16) - 100) * 1000; + driverBuild += ((identifier->DriverVersion.LowPart >> 16) - 100) * 1000; } - if (!directx_va_canUseDecoder(va, identifier.VendorId, identifier.DeviceId, + if (!directx_va_canUseDecoder(va, identifier->VendorId, identifier->DeviceId, input, driverBuild)) { char* psz_decoder_name = directx_va_GetDecoderName(input); diff -Nru vlc-3.0.18/modules/codec/avcodec/encoder.c vlc-3.0.20/modules/codec/avcodec/encoder.c --- vlc-3.0.18/modules/codec/avcodec/encoder.c 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/encoder.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * encoder.c: video and audio encoder using the libavcodec library ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN - * $Id: 6138c641c0cd241407a4eddb34283d9a9b2bd063 $ + * $Id: 2b1c3604713d97875d572030b51909ec1281a8d0 $ * * Authors: Laurent Aimar * Gildas Bazin @@ -113,9 +113,9 @@ /* * Video properties */ - mtime_t i_last_ref_pts; - mtime_t i_buggy_pts_detect; - mtime_t i_last_pts; + vlc_tick_t i_last_ref_pts; + vlc_tick_t i_buggy_pts_detect; + vlc_tick_t i_last_pts; bool b_inited; /* @@ -126,7 +126,7 @@ size_t i_samples_delay; //How much samples in delay buffer bool b_planar; bool b_variable; //Encoder can be fed with any size frames not just frame_size - mtime_t i_pts; + vlc_tick_t i_pts; date_t buffer_date; /* Multichannel (>2) channel reordering */ @@ -244,7 +244,7 @@ static void probe_video_frame_rate( encoder_t *p_enc, AVCodecContext *p_context, AVC_MAYBE_CONST AVCodec *p_codec ) { /* if we don't have i_frame_rate_base, we are probing and just checking if we can find codec - * so set fps to requested fps if asked by user or input fps is availabled */ + * so set fps to requested fps if asked by user or input fps is available */ p_context->time_base.num = p_enc->fmt_in.video.i_frame_rate_base ? p_enc->fmt_in.video.i_frame_rate_base : 1; // MP4V doesn't like CLOCK_FREQ denominator in time_base, so use 1/25 as default for that @@ -1079,7 +1079,7 @@ free(b); } -static block_t *vlc_av_packet_Wrap(AVPacket *packet, mtime_t i_length, AVCodecContext *context ) +static block_t *vlc_av_packet_Wrap(AVPacket *packet, vlc_tick_t i_length, AVCodecContext *context ) { if ( packet->data == NULL && packet->flags == 0 && @@ -1136,7 +1136,7 @@ static void check_hurry_up( encoder_sys_t *p_sys, AVFrame *frame, encoder_t *p_enc ) { - mtime_t current_date = mdate(); + vlc_tick_t current_date = mdate(); if ( current_date + HURRY_UP_GUARD3 > frame->pts ) { @@ -1231,7 +1231,7 @@ /* Set the pts of the frame being encoded * avcodec likes pts to be in time_base units * frame number */ - if( likely( p_pict->date > VLC_TS_INVALID ) ) + if( likely( p_pict->date > VLC_TICK_INVALID ) ) frame->pts = p_pict->date * p_sys->p_context->time_base.den / CLOCK_FREQ / p_sys->p_context->time_base.num; else @@ -1240,7 +1240,7 @@ if ( p_sys->b_hurry_up && frame->pts != AV_NOPTS_VALUE ) check_hurry_up( p_sys, frame, p_enc ); - if ( ( frame->pts != AV_NOPTS_VALUE ) && ( frame->pts != VLC_TS_INVALID ) ) + if ( ( frame->pts != AV_NOPTS_VALUE ) && ( frame->pts != VLC_TICK_INVALID ) ) { if ( p_sys->i_last_pts == frame->pts ) { @@ -1349,7 +1349,7 @@ //Calculate how many bytes we would need from current buffer to fill frame size_t leftover_samples = __MAX(0,__MIN((ssize_t)i_samples_left, (ssize_t)(p_sys->i_frame_size - p_sys->i_samples_delay))); - if( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) ) + if( p_aout_buf && ( p_aout_buf->i_pts > VLC_TICK_INVALID ) ) { date_Set( &p_sys->buffer_date, p_aout_buf->i_pts ); /* take back amount we have leftover from previous buffer*/ diff -Nru vlc-3.0.18/modules/codec/avcodec/subtitle.c vlc-3.0.20/modules/codec/avcodec/subtitle.c --- vlc-3.0.18/modules/codec/avcodec/subtitle.c 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/subtitle.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * subtitle.c: subtitle decoder using libavcodec library ***************************************************************************** * Copyright (C) 2009 Laurent Aimar - * $Id: d3afe4270bec1e80cf21bca33304320cdbdc4199 $ + * $Id: ecfe35a60012b6c49464a52c1c4ce834dd7dd46f $ * * Authors: Laurent Aimar * @@ -44,7 +44,7 @@ bool b_need_ephemer; /* Does the format need the ephemer flag (no end time set) */ }; -static subpicture_t *ConvertSubtitle(decoder_t *, AVSubtitle *, mtime_t pts, +static subpicture_t *ConvertSubtitle(decoder_t *, AVSubtitle *, vlc_tick_t pts, AVCodecContext *avctx); static int DecodeSubtitle(decoder_t *, block_t *); static void Flush(decoder_t *); @@ -288,7 +288,7 @@ /** * Convert a libavcodec subtitle to our format. */ -static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t pts, +static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, vlc_tick_t pts, AVCodecContext *avctx) { subpicture_t *spu = decoder_NewSubpicture(dec, NULL); diff -Nru vlc-3.0.18/modules/codec/avcodec/va.c vlc-3.0.20/modules/codec/avcodec/va.c --- vlc-3.0.18/modules/codec/avcodec/va.c 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/va.c 2023-04-22 23:27:28.000000000 +0000 @@ -96,13 +96,14 @@ { vlc_va_t *va = va_arg(ap, vlc_va_t *); AVCodecContext *ctx = va_arg(ap, AVCodecContext *); + const AVPixFmtDescriptor *src_desc = va_arg(ap, const AVPixFmtDescriptor *); enum PixelFormat pix_fmt = va_arg(ap, enum PixelFormat); const es_format_t *fmt = va_arg(ap, const es_format_t *); picture_sys_t *p_sys = va_arg(ap, picture_sys_t *); - int (*open)(vlc_va_t *, AVCodecContext *, enum PixelFormat, + int (*open)(vlc_va_t *, AVCodecContext *, const AVPixFmtDescriptor *, enum PixelFormat, const es_format_t *, picture_sys_t *) = func; - return open(va, ctx, pix_fmt, fmt, p_sys); + return open(va, ctx, src_desc, pix_fmt, fmt, p_sys); } static void vlc_va_Stop(void *func, va_list ap) @@ -114,7 +115,8 @@ close(va, hwctx); } -vlc_va_t *vlc_va_New(vlc_object_t *obj, AVCodecContext *avctx, +vlc_va_t *vlc_va_New(vlc_object_t *obj, + AVCodecContext *avctx, const AVPixFmtDescriptor *src_desc, enum PixelFormat pix_fmt, const es_format_t *fmt, picture_sys_t *p_sys) { @@ -125,7 +127,7 @@ char *modlist = var_InheritString(obj, "avcodec-hw"); va->module = vlc_module_load(va, "hw decoder", modlist, true, - vlc_va_Start, va, avctx, pix_fmt, fmt, p_sys); + vlc_va_Start, va, avctx, src_desc, pix_fmt, fmt, p_sys); free(modlist); if (va->module == NULL) { diff -Nru vlc-3.0.18/modules/codec/avcodec/va.h vlc-3.0.20/modules/codec/avcodec/va.h --- vlc-3.0.18/modules/codec/avcodec/va.h 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/va.h 2023-04-22 23:27:28.000000000 +0000 @@ -2,7 +2,7 @@ * va.h: Video Acceleration API for avcodec ***************************************************************************** * Copyright (C) 2009 Laurent Aimar - * $Id: ec327f5a68a197e70c253438e7724ddf3b9980de $ + * $Id$ * * Authors: Laurent Aimar * @@ -25,6 +25,7 @@ #ifndef VLC_AVCODEC_VA_H #define VLC_AVCODEC_VA_H 1 +#include typedef struct vlc_va_t vlc_va_t; typedef struct vlc_va_sys_t vlc_va_sys_t; @@ -54,7 +55,7 @@ * @param fmt VLC format of the content to decode * @return a new VLC object on success, NULL on error. */ -vlc_va_t *vlc_va_New(vlc_object_t *obj, AVCodecContext *, +vlc_va_t *vlc_va_New(vlc_object_t *obj, AVCodecContext *, const AVPixFmtDescriptor *, enum PixelFormat, const es_format_t *fmt, picture_sys_t *p_sys); diff -Nru vlc-3.0.18/modules/codec/avcodec/va_surface.c vlc-3.0.20/modules/codec/avcodec/va_surface.c --- vlc-3.0.18/modules/codec/avcodec/va_surface.c 2018-03-23 00:22:13.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/va_surface.c 2023-08-05 10:03:51.000000000 +0000 @@ -54,24 +54,12 @@ } /* */ -int va_pool_SetupDecoder(vlc_va_t *va, va_pool_t *va_pool, const AVCodecContext *avctx, unsigned count, int alignment) +int va_pool_SetupDecoder(vlc_va_t *va, va_pool_t *va_pool, const AVCodecContext *avctx, unsigned count, + int surface_width, int surface_height) { int err = VLC_ENOMEM; unsigned i = va_pool->surface_count; - if (avctx->coded_width <= 0 || avctx->coded_height <= 0) - return VLC_EGENERIC; - - assert((alignment & (alignment - 1)) == 0); /* power of 2 */ -#define ALIGN(x, y) (((x) + ((y) - 1)) & ~((y) - 1)) - int surface_width = ALIGN(avctx->coded_width, alignment); - int surface_height = ALIGN(avctx->coded_height, alignment); - - if (avctx->coded_width != surface_width || avctx->coded_height != surface_height) - msg_Warn( va, "surface dimensions (%dx%d) differ from avcodec dimensions (%dx%d)", - surface_width, surface_height, - avctx->coded_width, avctx->coded_height); - if ( va_pool->surface_count >= count && va_pool->surface_width == surface_width && va_pool->surface_height == surface_height ) diff -Nru vlc-3.0.18/modules/codec/avcodec/va_surface_internal.h vlc-3.0.20/modules/codec/avcodec/va_surface_internal.h --- vlc-3.0.18/modules/codec/avcodec/va_surface_internal.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/va_surface_internal.h 2023-08-05 10:03:51.000000000 +0000 @@ -80,7 +80,7 @@ int va_pool_Open(vlc_va_t *, va_pool_t *); void va_pool_Close(vlc_va_t *va, va_pool_t *); -int va_pool_SetupDecoder(vlc_va_t *, va_pool_t *, const AVCodecContext *, unsigned count, int alignment); +int va_pool_SetupDecoder(vlc_va_t *, va_pool_t *, const AVCodecContext *, unsigned count, int surface_width, int surface_height); int va_pool_SetupSurfaces(vlc_va_t *, va_pool_t *, unsigned count); int va_pool_Get(va_pool_t *, picture_t *); void va_surface_AddRef(vlc_va_surface_t *surface); diff -Nru vlc-3.0.18/modules/codec/avcodec/vaapi.c vlc-3.0.20/modules/codec/avcodec/vaapi.c --- vlc-3.0.18/modules/codec/avcodec/vaapi.c 2022-08-03 10:56:27.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/vaapi.c 2023-04-22 23:27:28.000000000 +0000 @@ -151,9 +151,11 @@ free(sys); } -static int Create(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt, +static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *desc, + enum PixelFormat pix_fmt, const es_format_t *fmt, picture_sys_t *p_sys) { + VLC_UNUSED(desc); if (pix_fmt != AV_PIX_FMT_VAAPI || p_sys == NULL) return VLC_EGENERIC; diff -Nru vlc-3.0.18/modules/codec/avcodec/video.c vlc-3.0.20/modules/codec/avcodec/video.c --- vlc-3.0.18/modules/codec/avcodec/video.c 2022-03-09 09:49:44.000000000 +0000 +++ vlc-3.0.20/modules/codec/avcodec/video.c 2023-10-30 07:20:48.000000000 +0000 @@ -2,7 +2,7 @@ * video.c: video decoder using the libavcodec library ***************************************************************************** * Copyright (C) 1999-2001 VLC authors and VideoLAN - * $Id: c1527a03a58ceb48f14ab10b117669f0064f0b32 $ + * $Id$ * * Authors: Laurent Aimar * Gildas Bazin @@ -46,6 +46,8 @@ #include "avcodec.h" #include "va.h" +#include "../../packetizer/av1_obu.h" +#include "../../packetizer/av1.h" #include "../codec/cc.h" /***************************************************************************** @@ -66,12 +68,13 @@ bool b_hurry_up; bool b_show_corrupted; bool b_from_preroll; + bool b_hardware_only; enum AVDiscard i_skip_frame; /* how many decoded frames are late */ int i_late_frames; - mtime_t i_late_frames_start; - mtime_t i_last_late_delay; + vlc_tick_t i_late_frames_start; + vlc_tick_t i_last_late_delay; /* for direct rendering */ bool b_direct_rendering; @@ -412,13 +415,14 @@ ctx->width = p_dec->fmt_in.video.i_visible_width; ctx->height = p_dec->fmt_in.video.i_visible_height; - ctx->coded_width = p_dec->fmt_in.video.i_width; - ctx->coded_height = p_dec->fmt_in.video.i_height; + if (!ctx->coded_width || !ctx->coded_height) + { + ctx->coded_width = p_dec->fmt_in.video.i_width; + ctx->coded_height = p_dec->fmt_in.video.i_height; + } ctx->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel; p_sys->pix_fmt = AV_PIX_FMT_NONE; - p_sys->profile = -1; - p_sys->level = -1; cc_Init( &p_sys->cc ); set_video_color_settings( &p_dec->fmt_in.video, ctx ); @@ -458,33 +462,13 @@ return 0; } -/***************************************************************************** - * InitVideo: initialize the video decoder - ***************************************************************************** - * the ffmpeg codec will be opened, some memory allocated. The vout is not yet - * opened (done after the first decoded frame). - *****************************************************************************/ -int InitVideoDec( vlc_object_t *obj ) +static int InitVideoDecCommon( decoder_t *p_dec ) { - decoder_t *p_dec = (decoder_t *)obj; - const AVCodec *p_codec; - AVCodecContext *p_context = ffmpeg_AllocContext( p_dec, &p_codec ); - if( p_context == NULL ) - return VLC_EGENERIC; - + decoder_sys_t *p_sys = p_dec->p_sys; + AVCodecContext *p_context = p_sys->p_context; + const AVCodec *p_codec = p_sys->p_codec; int i_val; - /* Allocate the memory needed to store the decoder's structure */ - decoder_sys_t *p_sys = calloc( 1, sizeof(*p_sys) ); - if( unlikely(p_sys == NULL) ) - { - avcodec_free_context( &p_context ); - return VLC_ENOMEM; - } - - p_dec->p_sys = p_sys; - p_sys->p_context = p_context; - p_sys->p_codec = p_codec; p_sys->p_va = NULL; vlc_sem_init( &p_sys->sem_mt, 0 ); @@ -556,7 +540,7 @@ p_context->get_buffer2 = lavc_GetFrame; p_context->opaque = p_dec; - int i_thread_count = var_InheritInteger( p_dec, "avcodec-threads" ); + int i_thread_count = p_sys->b_hardware_only ? 1 : var_InheritInteger( p_dec, "avcodec-threads" ); if( i_thread_count <= 0 ) { i_thread_count = vlc_GetCPUCount(); @@ -602,7 +586,7 @@ /* ***** misc init ***** */ date_Init(&p_sys->pts, 1, 30001); - date_Set(&p_sys->pts, VLC_TS_INVALID); + date_Set(&p_sys->pts, VLC_TICK_INVALID); p_sys->b_first_frame = true; p_sys->i_late_frames = 0; p_sys->b_from_preroll = false; @@ -649,6 +633,212 @@ return VLC_SUCCESS; } +static int ffmpeg_OpenVa(decoder_t *p_dec, AVCodecContext *p_context, + enum AVPixelFormat hwfmt, enum AVPixelFormat swfmt, + const AVPixFmtDescriptor *src_desc, + vlc_sem_t *open_lock) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + + if( hwfmt == AV_PIX_FMT_NONE ) + return VLC_EGENERIC; + + p_dec->fmt_out.video.i_chroma = vlc_va_GetChroma(hwfmt, swfmt); + if (p_dec->fmt_out.video.i_chroma == 0) + return VLC_EGENERIC; /* Unknown brand of hardware acceleration */ + if (p_context->width == 0 || p_context->height == 0) + { /* should never happen */ + msg_Err(p_dec, "unspecified video dimensions"); + return VLC_EGENERIC; + } + const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(hwfmt); + msg_Dbg(p_dec, "trying format %s", dsc ? dsc->name : "unknown"); + if (lavc_UpdateVideoFormat(p_dec, p_context, hwfmt, swfmt)) + return VLC_EGENERIC; /* Unsupported brand of hardware acceleration */ + + if (open_lock) + vlc_sem_post(open_lock); + + picture_t *test_pic = decoder_NewPicture(p_dec); + assert(!test_pic || test_pic->format.i_chroma == p_dec->fmt_out.video.i_chroma); + vlc_va_t *va = vlc_va_New(VLC_OBJECT(p_dec), p_context, src_desc, hwfmt, + &p_dec->fmt_in, + test_pic ? test_pic->p_sys : NULL); + + if (open_lock) + vlc_sem_wait(open_lock); + + if (test_pic) + picture_Release(test_pic); + if (va == NULL) + { + return VLC_EGENERIC; /* Unsupported codec profile or such */ + } + + if (va->description != NULL) + msg_Info(p_dec, "Using %s for hardware decoding", va->description); + + p_sys->p_va = va; + p_sys->pix_fmt = hwfmt; + p_context->draw_horiz_band = NULL; + return VLC_SUCCESS; +} + +static const enum PixelFormat hwfmts[] = +{ +#ifdef _WIN32 +#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100) + AV_PIX_FMT_D3D11VA_VLD, +#endif + AV_PIX_FMT_DXVA2_VLD, +#endif + AV_PIX_FMT_VAAPI, +#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0)) + AV_PIX_FMT_VDPAU, +#endif + AV_PIX_FMT_NONE, +}; + +static int ExtractAV1Profile(AVCodecContext *p_context, const es_format_t *fmt_in, decoder_sys_t *p_sys) +{ + av1_OBU_sequence_header_t *sequence_hdr = NULL; + unsigned w, h; + + if (fmt_in->i_extra > 4) + { + // in ISOBMFF/WebM/Matroska the first 4 bytes are from the AV1CodecConfigurationBox + // and then one or more OBU + const uint8_t *obu_start = ((const uint8_t*) fmt_in->p_extra) + 4; + int obu_size = fmt_in->i_extra - 4; + if (AV1_OBUIsValid(obu_start, obu_size) && AV1_OBUGetType(obu_start) == AV1_OBU_SEQUENCE_HEADER) + sequence_hdr = AV1_OBU_parse_sequence_header(obu_start, obu_size); + } + + if (sequence_hdr == NULL) + return VLC_EGENERIC; + + // fill the AVCodecContext with the values from the sequence header + // so we can create the expected VA right away: + // coded_width, coded_height, framerate, profile and sw_pix_fmt + + vlc_fourcc_t chroma = AV1_get_chroma(sequence_hdr); + if (chroma == 0) + { + AV1_release_sequence_header(sequence_hdr); + return VLC_EGENERIC; + } + p_context->sw_pix_fmt = FindFfmpegChroma(chroma); + + if (p_context->sw_pix_fmt == AV_PIX_FMT_NONE) + { + AV1_release_sequence_header(sequence_hdr); + return VLC_EGENERIC; + } + + AV1_get_frame_max_dimensions(sequence_hdr, &w, &h); + + p_context->coded_width = p_context->width = w; + p_context->coded_height = p_context->height = h; + + if (!fmt_in->video.i_frame_rate || !fmt_in->video.i_frame_rate_base) + { + unsigned num, den; + if (AV1_get_frame_rate(sequence_hdr, &num, &den)) + { + p_context->framerate.num = num; + p_context->framerate.den = den; + } + } + + int tier; + AV1_get_profile_level(sequence_hdr, &p_sys->profile, &p_sys->level, &tier); + + AV1_release_sequence_header(sequence_hdr); + + return VLC_SUCCESS; +} + +int InitVideoHwDec( vlc_object_t *obj ) +{ + decoder_t *p_dec = container_of(obj, decoder_t, obj); + + if (p_dec->fmt_in.i_codec != VLC_CODEC_AV1) + return VLC_EGENERIC; + + decoder_sys_t *p_sys = calloc(1, sizeof(*p_sys)); + if( unlikely(p_sys == NULL) ) + return VLC_ENOMEM; + + const AVCodec *p_codec; + AVCodecContext *p_context = ffmpeg_AllocContext( p_dec, &p_codec ); + if( unlikely(p_context == NULL) ) + { + free(p_sys); + return VLC_ENOMEM; + } + + if (ExtractAV1Profile(p_context, &p_dec->fmt_in, p_sys) != VLC_SUCCESS) + goto failed; + + p_dec->p_sys = p_sys; + p_sys->p_context = p_context; + p_sys->p_codec = p_codec; + p_sys->pix_fmt = AV_PIX_FMT_NONE; + p_sys->b_hardware_only = true; + + int res = InitVideoDecCommon( p_dec ); + if (res != VLC_SUCCESS) + return res; + + const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(p_context->sw_pix_fmt); + + for( size_t i = 0; hwfmts[i] != AV_PIX_FMT_NONE; i++ ) + { + if (ffmpeg_OpenVa(p_dec, p_context, hwfmts[i], p_context->sw_pix_fmt, src_desc, NULL) == VLC_SUCCESS) + // we have a matching hardware decoder + return VLC_SUCCESS; + } + + EndVideoDec(obj); + return VLC_EGENERIC; +failed: + avcodec_free_context( &p_context ); + free(p_sys); + return VLC_EGENERIC; +} + +/***************************************************************************** + * InitVideo: initialize the video decoder + ***************************************************************************** + * the ffmpeg codec will be opened, some memory allocated. The vout is not yet + * opened (done after the first decoded frame). + *****************************************************************************/ +int InitVideoDec( vlc_object_t *obj ) +{ + decoder_t *p_dec = (decoder_t *)obj; + const AVCodec *p_codec; + AVCodecContext *p_context = ffmpeg_AllocContext( p_dec, &p_codec ); + if( p_context == NULL ) + return VLC_EGENERIC; + + /* Allocate the memory needed to store the decoder's structure */ + decoder_sys_t *p_sys = calloc( 1, sizeof(*p_sys) ); + if( unlikely(p_sys == NULL) ) + { + avcodec_free_context( &p_context ); + return VLC_ENOMEM; + } + + p_dec->p_sys = p_sys; + p_sys->p_context = p_context; + p_sys->p_codec = p_codec; + p_sys->profile = -1; + p_sys->level = -1; + p_sys->b_hardware_only = false; + + return InitVideoDecCommon( p_dec ); +} + /***************************************************************************** * Flush: *****************************************************************************/ @@ -657,7 +847,7 @@ decoder_sys_t *p_sys = p_dec->p_sys; AVCodecContext *p_context = p_sys->p_context; - date_Set(&p_sys->pts, VLC_TS_INVALID); /* To make sure we recover properly */ + date_Set(&p_sys->pts, VLC_TICK_INVALID); /* To make sure we recover properly */ p_sys->i_late_frames = 0; p_sys->b_draining = false; cc_Flush( &p_sys->cc ); @@ -684,7 +874,7 @@ if( block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - date_Set( &p_sys->pts, VLC_TS_INVALID ); /* To make sure we recover properly */ + date_Set( &p_sys->pts, VLC_TICK_INVALID ); /* To make sure we recover properly */ cc_Flush( &p_sys->cc ); p_sys->i_late_frames = 0; @@ -697,7 +887,7 @@ return true; } -static bool check_block_being_late( decoder_sys_t *p_sys, block_t *block, mtime_t current_time) +static bool check_block_being_late( decoder_sys_t *p_sys, block_t *block, vlc_tick_t current_time) { if( !block ) return false; @@ -716,7 +906,7 @@ if( current_time - p_sys->i_late_frames_start > (5*CLOCK_FREQ)) { - date_Set( &p_sys->pts, VLC_TS_INVALID ); /* To make sure we recover properly */ + date_Set( &p_sys->pts, VLC_TICK_INVALID ); /* To make sure we recover properly */ block_Release( block ); p_sys->i_late_frames--; return true; @@ -746,14 +936,14 @@ return false; } -static mtime_t interpolate_next_pts( decoder_t *p_dec, AVFrame *frame ) +static vlc_tick_t interpolate_next_pts( decoder_t *p_dec, AVFrame *frame ) { decoder_sys_t *p_sys = p_dec->p_sys; AVCodecContext *p_context = p_sys->p_context; - if( date_Get( &p_sys->pts ) == VLC_TS_INVALID || + if( date_Get( &p_sys->pts ) == VLC_TICK_INVALID || p_sys->pts.i_divider_num == 0 ) - return VLC_TS_INVALID; + return VLC_TICK_INVALID; int i_tick = p_context->ticks_per_frame; if( i_tick <= 0 ) @@ -764,18 +954,18 @@ } static void update_late_frame_count( decoder_t *p_dec, block_t *p_block, - mtime_t current_time, mtime_t i_pts, - mtime_t i_next_pts ) + vlc_tick_t current_time, vlc_tick_t i_pts, + vlc_tick_t i_next_pts ) { decoder_sys_t *p_sys = p_dec->p_sys; /* Update frame late count (except when doing preroll) */ - mtime_t i_display_date = VLC_TS_INVALID; + vlc_tick_t i_display_date = VLC_TICK_INVALID; if( !p_block || !(p_block->i_flags & BLOCK_FLAG_PREROLL) ) i_display_date = decoder_GetDisplayDate( p_dec, i_pts ); - mtime_t i_threshold = i_next_pts != VLC_TS_INVALID ? (i_next_pts - i_pts) / 2 : 20000; + vlc_tick_t i_threshold = i_next_pts != VLC_TICK_INVALID ? (i_next_pts - i_pts) / 2 : 20000; - if( i_display_date > VLC_TS_INVALID && i_display_date + i_threshold <= current_time ) + if( i_display_date > VLC_TICK_INVALID && i_display_date + i_threshold <= current_time ) { /* Out of preroll, consider only late frames on rising delay */ if( p_sys->b_from_preroll ) @@ -924,7 +1114,7 @@ block_t *p_block; - mtime_t current_time; + vlc_tick_t current_time; if( !p_context->extradata_size && p_dec->fmt_in.i_extra ) { @@ -1027,12 +1217,12 @@ { pkt->data = p_block->p_buffer; pkt->size = p_block->i_buffer; - pkt->pts = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : AV_NOPTS_VALUE; - pkt->dts = p_block->i_dts > VLC_TS_INVALID ? p_block->i_dts : AV_NOPTS_VALUE; + pkt->pts = p_block->i_pts > VLC_TICK_INVALID ? p_block->i_pts : AV_NOPTS_VALUE; + pkt->dts = p_block->i_dts > VLC_TICK_INVALID ? p_block->i_dts : AV_NOPTS_VALUE; /* Make sure we don't reuse the same timestamps twice */ p_block->i_pts = - p_block->i_dts = VLC_TS_INVALID; + p_block->i_dts = VLC_TICK_INVALID; } else /* start drain */ { @@ -1118,12 +1308,12 @@ /* Compute the PTS */ #if LIBAVCODEC_VERSION_CHECK(57, 24, 0, 61, 100) # if LIBAVCODEC_VERSION_MICRO >= 100 - mtime_t i_pts = frame->best_effort_timestamp; + vlc_tick_t i_pts = frame->best_effort_timestamp; # else - mtime_t i_pts = frame->pts; + vlc_tick_t i_pts = frame->pts; # endif #else - mtime_t i_pts = frame->pkt_pts; + vlc_tick_t i_pts = frame->pkt_pts; #endif if (i_pts == AV_NOPTS_VALUE ) i_pts = frame->pkt_dts; @@ -1132,10 +1322,10 @@ i_pts = date_Get( &p_sys->pts ); /* Interpolate the next PTS */ - if( i_pts > VLC_TS_INVALID ) + if( i_pts > VLC_TICK_INVALID ) date_Set( &p_sys->pts, i_pts ); - const mtime_t i_next_pts = interpolate_next_pts(p_dec, frame); + const vlc_tick_t i_next_pts = interpolate_next_pts(p_dec, frame); update_late_frame_count( p_dec, p_block, current_time, i_pts, i_next_pts); @@ -1240,12 +1430,12 @@ p_pic->b_top_field_first = frame->top_field_first; if (DecodeSidedata(p_dec, frame, p_pic)) - i_pts = VLC_TS_INVALID; + i_pts = VLC_TICK_INVALID; av_frame_free(&frame); /* Send decoded frame to vout */ - if (i_pts > VLC_TS_INVALID) + if (i_pts > VLC_TICK_INVALID) { p_sys->b_first_frame = false; return p_pic; @@ -1538,7 +1728,8 @@ video_format_t fmt; /* Enumerate available formats */ - enum PixelFormat swfmt = avcodec_default_get_format(p_context, pi_fmt); + enum PixelFormat defaultfmt = avcodec_default_get_format(p_context, pi_fmt); + enum PixelFormat swfmt = AV_PIX_FMT_NONE; bool can_hwaccel = false; for (size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++) @@ -1551,7 +1742,31 @@ msg_Dbg( p_dec, "available %sware decoder output format %d (%s)", hwaccel ? "hard" : "soft", pi_fmt[i], dsc->name ); if (hwaccel) + { + /* The default fmt is a hw format, it can happen with some va + * implementations (when using a hw_device_ctx). */ + if (defaultfmt == pi_fmt[i]) + defaultfmt = AV_PIX_FMT_NONE; + can_hwaccel = true; + } + else if (swfmt == AV_PIX_FMT_NONE && !p_sys->b_hardware_only) + swfmt = pi_fmt[i]; + } + + /* Use the default fmt in priority of any sw fmt if the default fmt is a hw + * one */ + if (defaultfmt != AV_PIX_FMT_NONE) + { + if (p_sys->b_hardware_only) + { + if (defaultfmt != p_context->sw_pix_fmt) + { + // the source format changed and we didn't detect it + vlc_assert_unreachable(); + } + } + swfmt = defaultfmt; } if (p_sys->pix_fmt == AV_PIX_FMT_NONE) @@ -1594,6 +1809,10 @@ if (p_sys->p_va != NULL) { msg_Err(p_dec, "existing hardware acceleration cannot be reused"); + // the decoder changes have to be handled outside of lavc so that + // switching to a software decoder will not silently decode nothing + // (get_format will fail to use AV_PIX_FMT_NONE) + assert(!p_sys->b_hardware_only); vlc_va_Delete(p_sys->p_va, &p_context->hwaccel_context); p_sys->p_va = NULL; } @@ -1616,20 +1835,7 @@ wait_mt(p_sys); - static const enum PixelFormat hwfmts[] = - { -#ifdef _WIN32 -#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100) - AV_PIX_FMT_D3D11VA_VLD, -#endif - AV_PIX_FMT_DXVA2_VLD, -#endif - AV_PIX_FMT_VAAPI, -#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0)) - AV_PIX_FMT_VDPAU, -#endif - AV_PIX_FMT_NONE, - }; + const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(swfmt); for( size_t i = 0; hwfmts[i] != AV_PIX_FMT_NONE; i++ ) { @@ -1638,42 +1844,10 @@ if( hwfmts[i] == pi_fmt[j] ) hwfmt = hwfmts[i]; - if( hwfmt == AV_PIX_FMT_NONE ) + if (ffmpeg_OpenVa(p_dec, p_context, hwfmt, swfmt, src_desc, &p_sys->sem_mt) != VLC_SUCCESS) continue; - p_dec->fmt_out.video.i_chroma = vlc_va_GetChroma(hwfmt, swfmt); - if (p_dec->fmt_out.video.i_chroma == 0) - continue; /* Unknown brand of hardware acceleration */ - if (p_context->width == 0 || p_context->height == 0) - { /* should never happen */ - msg_Err(p_dec, "unspecified video dimensions"); - continue; - } - const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(hwfmt); - msg_Dbg(p_dec, "trying format %s", dsc ? dsc->name : "unknown"); - if (lavc_UpdateVideoFormat(p_dec, p_context, hwfmt, swfmt)) - continue; /* Unsupported brand of hardware acceleration */ post_mt(p_sys); - - picture_t *test_pic = decoder_NewPicture(p_dec); - assert(!test_pic || test_pic->format.i_chroma == p_dec->fmt_out.video.i_chroma); - vlc_va_t *va = vlc_va_New(VLC_OBJECT(p_dec), p_context, hwfmt, - &p_dec->fmt_in, - test_pic ? test_pic->p_sys : NULL); - if (test_pic) - picture_Release(test_pic); - if (va == NULL) - { - wait_mt(p_sys); - continue; /* Unsupported codec profile or such */ - } - - if (va->description != NULL) - msg_Info(p_dec, "Using %s for hardware decoding", va->description); - - p_sys->p_va = va; - p_sys->pix_fmt = hwfmt; - p_context->draw_horiz_band = NULL; return hwfmt; } diff -Nru vlc-3.0.18/modules/codec/bpg.c vlc-3.0.20/modules/codec/bpg.c --- vlc-3.0.18/modules/codec/bpg.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/bpg.c 2023-02-11 09:33:17.000000000 +0000 @@ -149,7 +149,7 @@ } } - p_pic->date = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : p_block->i_dts; + p_pic->date = p_block->i_pts > VLC_TICK_INVALID ? p_block->i_pts : p_block->i_dts; decoder_QueueVideo( p_dec, p_pic ); error: diff -Nru vlc-3.0.18/modules/codec/cc.c vlc-3.0.20/modules/codec/cc.c --- vlc-3.0.18/modules/codec/cc.c 2020-03-05 19:11:39.000000000 +0000 +++ vlc-3.0.20/modules/codec/cc.c 2023-02-11 09:33:17.000000000 +0000 @@ -25,7 +25,7 @@ /***************************************************************************** * Preamble *****************************************************************************/ -/* The EIA 608 decoder part has been initialy based on ccextractor (GPL) +/* The EIA 608 decoder part has been initially based on ccextractor (GPL) * and rewritten */ #ifdef HAVE_CONFIG_H @@ -231,7 +231,7 @@ static int Decode( decoder_t *, block_t * ); static void Flush( decoder_t * ); -static void DTVCC_ServiceData_Handler( void *priv, uint8_t i_sid, mtime_t i_time, +static void DTVCC_ServiceData_Handler( void *priv, uint8_t i_sid, vlc_tick_t i_time, const uint8_t *p_data, size_t i_data ) { decoder_t *p_dec = priv; @@ -340,7 +340,7 @@ ****************************************************************************/ static void Push( decoder_t *, block_t * ); static block_t *Pop( decoder_t *, bool ); -static void Convert( decoder_t *, mtime_t, const uint8_t *, size_t ); +static void Convert( decoder_t *, vlc_tick_t, const uint8_t *, size_t ); static bool DoDecode( decoder_t *p_dec, bool b_drain ) { @@ -440,7 +440,7 @@ /* find insertion point */ for( pp_block = &p_sys->p_queue; *pp_block ; pp_block = &((*pp_block)->p_next) ) { - if( p_block->i_pts == VLC_TS_INVALID || (*pp_block)->i_pts == VLC_TS_INVALID ) + if( p_block->i_pts == VLC_TICK_INVALID || (*pp_block)->i_pts == VLC_TICK_INVALID ) continue; if( p_block->i_pts < (*pp_block)->i_pts ) { @@ -482,13 +482,13 @@ return p_block; } -static subpicture_t *Subtitle( decoder_t *p_dec, eia608_t *h, mtime_t i_pts ) +static subpicture_t *Subtitle( decoder_t *p_dec, eia608_t *h, vlc_tick_t i_pts ) { //decoder_sys_t *p_sys = p_dec->p_sys; subpicture_t *p_spu = NULL; /* We cannot display a subpicture with no date */ - if( i_pts <= VLC_TS_INVALID ) + if( i_pts <= VLC_TICK_INVALID ) return NULL; /* Create the subpicture unit */ @@ -530,7 +530,7 @@ return p_spu; } -static void Convert( decoder_t *p_dec, mtime_t i_pts, +static void Convert( decoder_t *p_dec, vlc_tick_t i_pts, const uint8_t *p_buffer, size_t i_buffer ) { decoder_sys_t *p_sys = p_dec->p_sys; @@ -540,7 +540,7 @@ { if( (p_buffer[0] & 0x04) /* Valid bit */ ) { - const mtime_t i_spupts = i_pts + i_ticks * CLOCK_FREQ / (1200/3); + const vlc_tick_t i_spupts = i_pts + i_ticks * CLOCK_FREQ / (1200/3); /* Mask off the specific i_field bit, else some sequences can be lost. */ if ( p_sys->p_eia608 && (p_buffer[0] & 0x03) == p_sys->i_field ) @@ -777,7 +777,7 @@ static eia608_status_t Eia608ParseDouble( eia608_t *h, uint8_t d2 ) { assert( d2 >= 0x30 && d2 <= 0x3f ); - Eia608Write( h, d2 + 0x50 ); /* We use charaters 0x80...0x8f */ + Eia608Write( h, d2 + 0x50 ); /* We use characters 0x80...0x8f */ return EIA608_STATUS_CHANGED; } static eia608_status_t Eia608ParseExtended( eia608_t *h, uint8_t d1, uint8_t d2 ) @@ -785,9 +785,9 @@ assert( d2 >= 0x20 && d2 <= 0x3f ); assert( d1 == 0x12 || d1 == 0x13 ); if( d1 == 0x12 ) - d2 += 0x70; /* We use charaters 0x90-0xaf */ + d2 += 0x70; /* We use characters 0x90-0xaf */ else - d2 += 0x90; /* We use charaters 0xb0-0xcf */ + d2 += 0x90; /* We use characters 0xb0-0xcf */ /* The extended characters replace the previous one with a more * advanced one */ @@ -958,7 +958,7 @@ i_status |= Eia608ParseSingle( h, d2 ); } - /* Ignore changes occuring to doublebuffer */ + /* Ignore changes occurring to doublebuffer */ if( h->mode == EIA608_MODE_POPUP && i_status == EIA608_STATUS_CHANGED ) i_status = EIA608_STATUS_DEFAULT; @@ -1008,7 +1008,7 @@ E2( 0x91, 0xc3,0x89), // capital letter E with acute E2( 0x92, 0xc3,0x93), // capital letter O with acute E2( 0x93, 0xc3,0x9a), // capital letter U with acute - E2( 0x94, 0xc3,0x9c), // capital letter U with diaresis + E2( 0x94, 0xc3,0x9c), // capital letter U with diaeresis E2( 0x95, 0xc3,0xbc), // lowercase letter U with diaeresis E1( 0x96, 0x27), // apostrophe E2( 0x97, 0xc2,0xa1), // inverted exclamation mark @@ -1025,11 +1025,11 @@ E2( 0xa2, 0xc3,0x87), // uppercase C with cedilla E2( 0xa3, 0xc3,0x88), // uppercase E, grave accent E2( 0xa4, 0xc3,0x8a), // uppercase E, circumflex - E2( 0xa5, 0xc3,0x8b), // capital letter E with diaresis - E2( 0xa6, 0xc3,0xab), // lowercase letter e with diaresis + E2( 0xa5, 0xc3,0x8b), // capital letter E with diaeresis + E2( 0xa6, 0xc3,0xab), // lowercase letter e with diaeresis E2( 0xa7, 0xc3,0x8e), // uppercase I, circumflex - E2( 0xa8, 0xc3,0x8f), // uppercase I, with diaresis - E2( 0xa9, 0xc3,0xaf), // lowercase i, with diaresis + E2( 0xa8, 0xc3,0x8f), // uppercase I, with diaeresis + E2( 0xa9, 0xc3,0xaf), // lowercase i, with diaeresis E2( 0xaa, 0xc3,0x94), // uppercase O, circumflex E2( 0xab, 0xc3,0x99), // uppercase U, grave accent E2( 0xac, 0xc3,0xb9), // lowercase u, grave accent diff -Nru vlc-3.0.18/modules/codec/cdg.c vlc-3.0.20/modules/codec/cdg.c --- vlc-3.0.18/modules/codec/cdg.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/cdg.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * cdg.c: CDG decoder module ***************************************************************************** * Copyright (C) 2007 Laurent Aimar - * $Id: 084fc3b61b22e7f76a85c5837da5d965efe6faf3 $ + * $Id: 4ede0c97ade1e8823ba35f90881b5f3c9002fb91 $ * * Authors: Laurent Aimar * @@ -177,7 +177,7 @@ goto exit; Render( p_sys, p_pic ); - p_pic->date = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : p_block->i_dts; + p_pic->date = p_block->i_pts > VLC_TICK_INVALID ? p_block->i_pts : p_block->i_dts; } exit: diff -Nru vlc-3.0.18/modules/codec/cea708.c vlc-3.0.20/modules/codec/cea708.c --- vlc-3.0.18/modules/codec/cea708.c 2020-02-15 12:08:28.000000000 +0000 +++ vlc-3.0.20/modules/codec/cea708.c 2023-02-11 09:33:17.000000000 +0000 @@ -45,7 +45,7 @@ uint8_t i_total_data; uint8_t i_data; uint8_t data[CEA708_DTVCC_MAX_PKT_SIZE]; - mtime_t i_time; + vlc_tick_t i_time; service_data_hdlr_t p_callback; void *priv; }; @@ -73,7 +73,7 @@ return h; } -static void CEA708_DTVCC_Demux_ServiceBlocks( cea708_demux_t *h, mtime_t i_start, +static void CEA708_DTVCC_Demux_ServiceBlocks( cea708_demux_t *h, vlc_tick_t i_start, const uint8_t *p_data, size_t i_data ) { while( i_data >= 2 ) @@ -101,7 +101,7 @@ } } -void CEA708_DTVCC_Demuxer_Push( cea708_demux_t *h, mtime_t i_start, const uint8_t data[3] ) +void CEA708_DTVCC_Demuxer_Push( cea708_demux_t *h, vlc_tick_t i_start, const uint8_t data[3] ) { if( (data[0] & 0x03) == 3 ) /* Header packet */ { @@ -440,8 +440,8 @@ /* Decoding context */ cea708_window_t *p_cw; /* current window */ - mtime_t suspended_deadline; /* > 0 when delay is active */ - mtime_t i_clock; + vlc_tick_t suspended_deadline; /* > 0 when delay is active */ + vlc_tick_t i_clock; bool b_text_waiting; }; @@ -1662,7 +1662,7 @@ } } -void CEA708_Decoder_Push( cea708_t *h, mtime_t i_time, +void CEA708_Decoder_Push( cea708_t *h, vlc_tick_t i_time, const uint8_t *p_data, size_t i_data ) { /* Set new buffer start time */ diff -Nru vlc-3.0.18/modules/codec/cea708.h vlc-3.0.20/modules/codec/cea708.h --- vlc-3.0.18/modules/codec/cea708.h 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/cea708.h 2023-01-01 22:21:52.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef VLC_CEA708_H_ #define VLC_CEA708_H_ -typedef void(*service_data_hdlr_t)(void *, uint8_t i_sid, mtime_t, +typedef void(*service_data_hdlr_t)(void *, uint8_t i_sid, vlc_tick_t, const uint8_t *p_data, size_t i_data); /* DVTCC Services demuxing */ @@ -29,7 +29,7 @@ cea708_demux_t * CEA708_DTVCC_Demuxer_New( void *, service_data_hdlr_t ); void CEA708_DTVCC_Demuxer_Release( cea708_demux_t * ); -void CEA708_DTVCC_Demuxer_Push( cea708_demux_t *h, mtime_t, const uint8_t data[3] ); +void CEA708_DTVCC_Demuxer_Push( cea708_demux_t *h, vlc_tick_t, const uint8_t data[3] ); void CEA708_DTVCC_Demuxer_Flush( cea708_demux_t *h ); /* DVTCC Services decoding */ @@ -37,7 +37,7 @@ cea708_t *CEA708_Decoder_New( decoder_t * ); void CEA708_Decoder_Release( cea708_t *p_cea708 ); -void CEA708_Decoder_Push( cea708_t *p_cea708, mtime_t, +void CEA708_Decoder_Push( cea708_t *p_cea708, vlc_tick_t, const uint8_t *p_data, size_t i_data ); void CEA708_Decoder_Flush( cea708_t *p_cea708 ); diff -Nru vlc-3.0.18/modules/codec/crystalhd.c vlc-3.0.20/modules/codec/crystalhd.c --- vlc-3.0.18/modules/codec/crystalhd.c 2022-08-24 17:42:00.000000000 +0000 +++ vlc-3.0.20/modules/codec/crystalhd.c 2023-02-11 09:33:17.000000000 +0000 @@ -457,7 +457,7 @@ BC_STATUS status = BC_FUNC_PSYS(DtsProcInput)( p_sys->bcm_handle, p_block->p_buffer, p_block->i_buffer, - p_block->i_pts >= VLC_TS_INVALID ? TO_BC_PTS(p_block->i_pts) : 0, false ); + p_block->i_pts >= VLC_TICK_INVALID ? TO_BC_PTS(p_block->i_pts) : 0, false ); block_Release( p_block ); @@ -514,7 +514,7 @@ // crystal_CopyPicture( p_pic, &proc_out ); p_pic->date = proc_out.PicInfo.timeStamp > 0 ? - FROM_BC_PTS(proc_out.PicInfo.timeStamp) : VLC_TS_INVALID; + FROM_BC_PTS(proc_out.PicInfo.timeStamp) : VLC_TICK_INVALID; //p_pic->date += 100 * 1000; #ifdef DEBUG_CRYSTALHD msg_Dbg( p_dec, "TS Output is %"PRIu64, p_pic->date); diff -Nru vlc-3.0.18/modules/codec/cvdsub.c vlc-3.0.20/modules/codec/cvdsub.c --- vlc-3.0.18/modules/codec/cvdsub.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/cvdsub.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * cvdsub.c : CVD Subtitle decoder ***************************************************************************** * Copyright (C) 2003, 2004 VLC authors and VideoLAN - * $Id: 3905bec032760307b541620f0d3951f6a6ebc477 $ + * $Id: dd6db458ad55e445d6e9643bed1000e484c3d2c4 $ * * Authors: Rocky Bernstein * Gildas Bazin @@ -91,7 +91,7 @@ size_t metadata_offset; /* offset to data describing the image */ size_t metadata_length; /* length of metadata */ - mtime_t i_duration; /* how long to display the image, 0 stands + vlc_tick_t i_duration; /* how long to display the image, 0 stands for "until next subtitle" */ uint16_t i_x_start, i_y_start; /* position of top leftmost pixel of @@ -236,7 +236,7 @@ * to detect the first packet in a subtitle. The first packet * seems to have a valid PTS while later packets for the same * image don't. */ - if( p_sys->i_state == SUBTITLE_BLOCK_EMPTY && p_block->i_pts <= VLC_TS_INVALID ) + if( p_sys->i_state == SUBTITLE_BLOCK_EMPTY && p_block->i_pts <= VLC_TICK_INVALID ) { msg_Warn( p_dec, "first packet expected but no PTS present"); return NULL; diff -Nru vlc-3.0.18/modules/codec/daala.c vlc-3.0.20/modules/codec/daala.c --- vlc-3.0.18/modules/codec/daala.c 2021-06-13 09:32:34.000000000 +0000 +++ vlc-3.0.20/modules/codec/daala.c 2023-02-11 09:33:17.000000000 +0000 @@ -70,7 +70,7 @@ /* * Common properties */ - mtime_t i_pts; + vlc_tick_t i_pts; }; /***************************************************************************** @@ -177,7 +177,7 @@ p_dec->p_sys = p_sys; p_dec->p_sys->b_packetizer = false; p_sys->b_has_headers = false; - p_sys->i_pts = VLC_TS_INVALID; + p_sys->i_pts = VLC_TICK_INVALID; p_sys->b_decoded_first_keyframe = false; p_sys->dcx = NULL; @@ -433,7 +433,7 @@ } /* Date management */ - if( p_block->i_pts > VLC_TS_INVALID && p_block->i_pts != p_sys->i_pts ) + if( p_block->i_pts > VLC_TICK_INVALID && p_block->i_pts != p_sys->i_pts ) { p_sys->i_pts = p_block->i_pts; } diff -Nru vlc-3.0.18/modules/codec/dav1d.c vlc-3.0.20/modules/codec/dav1d.c --- vlc-3.0.18/modules/codec/dav1d.c 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.20/modules/codec/dav1d.c 2023-04-22 23:27:28.000000000 +0000 @@ -89,27 +89,35 @@ vlc_fourcc_t i_chroma; enum Dav1dPixelLayout i_chroma_id; uint8_t i_bitdepth; + enum Dav1dTransferCharacteristics transfer_characteristics; } chroma_table[] = { - {VLC_CODEC_GREY, DAV1D_PIXEL_LAYOUT_I400, 8}, - {VLC_CODEC_I420, DAV1D_PIXEL_LAYOUT_I420, 8}, - {VLC_CODEC_I422, DAV1D_PIXEL_LAYOUT_I422, 8}, - {VLC_CODEC_I444, DAV1D_PIXEL_LAYOUT_I444, 8}, - - {VLC_CODEC_I420_10L, DAV1D_PIXEL_LAYOUT_I420, 10}, - {VLC_CODEC_I422_10L, DAV1D_PIXEL_LAYOUT_I422, 10}, - {VLC_CODEC_I444_10L, DAV1D_PIXEL_LAYOUT_I444, 10}, - - {VLC_CODEC_I420_12L, DAV1D_PIXEL_LAYOUT_I420, 12}, - {VLC_CODEC_I422_12L, DAV1D_PIXEL_LAYOUT_I422, 12}, - {VLC_CODEC_I444_12L, DAV1D_PIXEL_LAYOUT_I444, 12}, + /* Transfer characteristic-dependent mappings must come first */ + {VLC_CODEC_GBR_PLANAR, DAV1D_PIXEL_LAYOUT_I444, 8, DAV1D_TRC_SRGB}, + {VLC_CODEC_GBR_PLANAR_10L, DAV1D_PIXEL_LAYOUT_I444, 10, DAV1D_TRC_SRGB}, + + {VLC_CODEC_GREY, DAV1D_PIXEL_LAYOUT_I400, 8, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I420, DAV1D_PIXEL_LAYOUT_I420, 8, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I422, DAV1D_PIXEL_LAYOUT_I422, 8, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I444, DAV1D_PIXEL_LAYOUT_I444, 8, DAV1D_TRC_UNKNOWN}, + + {VLC_CODEC_I420_10L, DAV1D_PIXEL_LAYOUT_I420, 10, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I422_10L, DAV1D_PIXEL_LAYOUT_I422, 10, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I444_10L, DAV1D_PIXEL_LAYOUT_I444, 10, DAV1D_TRC_UNKNOWN}, + + {VLC_CODEC_I420_12L, DAV1D_PIXEL_LAYOUT_I420, 12, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I422_12L, DAV1D_PIXEL_LAYOUT_I422, 12, DAV1D_TRC_UNKNOWN}, + {VLC_CODEC_I444_12L, DAV1D_PIXEL_LAYOUT_I444, 12, DAV1D_TRC_UNKNOWN}, }; static vlc_fourcc_t FindVlcChroma(const Dav1dPicture *img) { + for (unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++) if (chroma_table[i].i_chroma_id == img->p.layout && - chroma_table[i].i_bitdepth == img->p.bpc) + chroma_table[i].i_bitdepth == img->p.bpc && + (chroma_table[i].transfer_characteristics == DAV1D_TRC_UNKNOWN || + chroma_table[i].transfer_characteristics == img->seq_hdr->trc)) return chroma_table[i].i_chroma; return 0; @@ -121,10 +129,10 @@ video_format_t *v = &dec->fmt_out.video; - v->i_visible_width = img->p.w; - v->i_visible_height = img->p.h; - v->i_width = (img->p.w + 0x7F) & ~0x7F; - v->i_height = (img->p.h + 0x7F) & ~0x7F; + v->i_visible_width = img->seq_hdr->max_width; + v->i_visible_height = img->seq_hdr->max_height; + v->i_width = (img->seq_hdr->max_width + 0x7F) & ~0x7F; + v->i_height = (img->seq_hdr->max_height + 0x7F) & ~0x7F; if( !v->i_sar_num || !v->i_sar_den ) { @@ -140,6 +148,33 @@ v->b_color_range_full = img->seq_hdr->color_range; } + const Dav1dMasteringDisplay *md = img->mastering_display; + if( dec->fmt_in.video.mastering.max_luminance == 0 && md ) + { + const uint8_t RGB2GBR[3] = {2,0,1}; + for( size_t i=0;i<6; i++ ) + { + v->mastering.primaries[i] = + 50000 * (double) md->primaries[RGB2GBR[i >> 1]][i % 2] + / (double)(1 << 16); + } + v->mastering.min_luminance = 10000 * (double)md->min_luminance + / (double) (1<<14); + v->mastering.max_luminance = 10000 * (double) md->max_luminance + / (double) (1<<8); + v->mastering.white_point[0] = 50000 * (double)md->white_point[0] + / (double) (1<<16); + v->mastering.white_point[1] = 50000 * (double)md->white_point[1] + / (double) (1<<16); + } + + const Dav1dContentLightLevel *cll = img->content_light; + if( dec->fmt_in.video.lighting.MaxCLL == 0 && cll ) + { + v->lighting.MaxCLL = cll->max_content_light_level; + v->lighting.MaxFALL = cll->max_frame_average_light_level; + } + v->projection_mode = dec->fmt_in.video.projection_mode; v->multiview_mode = dec->fmt_in.video.multiview_mode; v->pose = dec->fmt_in.video.pose; @@ -215,7 +250,7 @@ block_Release(block); return VLCDEC_ECRITICAL; } - mtime_t pts = block->i_pts == VLC_TS_INVALID ? block->i_dts : block->i_pts; + vlc_tick_t pts = block->i_pts == VLC_TICK_INVALID ? block->i_dts : block->i_pts; p_data->m.timestamp = pts; b_eos = (block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE); } @@ -261,7 +296,6 @@ } pic->b_progressive = true; /* codec does not support interlacing */ pic->date = img.m.timestamp; - /* TODO udpate the color primaries and such */ decoder_QueueVideo(dec, pic); dav1d_picture_unref(&img); } @@ -374,6 +408,8 @@ dec->fmt_out.video.transfer = dec->fmt_in.video.transfer; dec->fmt_out.video.space = dec->fmt_in.video.space; dec->fmt_out.video.b_color_range_full = dec->fmt_in.video.b_color_range_full; + dec->fmt_out.video.mastering = dec->fmt_in.video.mastering; + dec->fmt_out.video.lighting = dec->fmt_in.video.lighting; return VLC_SUCCESS; } diff -Nru vlc-3.0.18/modules/codec/dmo/dmo.c vlc-3.0.20/modules/codec/dmo/dmo.c --- vlc-3.0.18/modules/codec/dmo/dmo.c 2019-05-23 17:09:46.000000000 +0000 +++ vlc-3.0.20/modules/codec/dmo/dmo.c 2023-02-11 09:33:17.000000000 +0000 @@ -2,7 +2,7 @@ * dmo.c : DirectMedia Object decoder module for vlc ***************************************************************************** * Copyright (C) 2002, 2003 VLC authors and VideoLAN - * $Id: 5ab1a11c54f7d705363534448223022269e60d23 $ + * $Id: 49a6476dd9d4cd4afd5ac241ec3447daf9d7c83a $ * * Author: Gildas Bazin * @@ -838,11 +838,11 @@ p_block = *pp_block; /* Won't work with streams with B-frames, but do we have any ? */ - if( p_block && p_block->i_pts <= VLC_TS_INVALID ) + if( p_block && p_block->i_pts <= VLC_TICK_INVALID ) p_block->i_pts = p_block->i_dts; /* Date management */ - if( p_block && p_block->i_pts > VLC_TS_INVALID && + if( p_block && p_block->i_pts > VLC_TICK_INVALID && p_block->i_pts != date_Get( &p_sys->end_date ) ) { date_Set( &p_sys->end_date, p_block->i_pts ); @@ -1475,7 +1475,7 @@ block_t *p_block_in; uint32_t i_status; int i_result; - mtime_t i_pts; + vlc_tick_t i_pts; if( !p_data ) return NULL; diff -Nru vlc-3.0.18/modules/codec/dvbsub.c vlc-3.0.20/modules/codec/dvbsub.c --- vlc-3.0.18/modules/codec/dvbsub.c 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.20/modules/codec/dvbsub.c 2023-02-11 09:33:17.000000000 +0000 @@ -4,7 +4,7 @@ ***************************************************************************** * Copyright (C) 2003 ANEVIA * Copyright (C) 2003-2009 VLC authors and VideoLAN - * $Id: 2040b90c77ceb62164ec2fbdde2b0449e753b68b $ + * $Id: beb8e26d5a62fd2d20397b0badab4cfe2e0e8d6e $ * * Authors: Gildas Bazin * Damien LUCAS @@ -256,7 +256,7 @@ /* Decoder internal data */ int i_id; int i_ancillary_id; - mtime_t i_pts; + vlc_tick_t i_pts; bool b_absolute; int i_spu_position; @@ -340,7 +340,7 @@ if( !p_sys ) return VLC_ENOMEM; - p_sys->i_pts = VLC_TS_INVALID; + p_sys->i_pts = VLC_TICK_INVALID; p_sys->i_id = p_dec->fmt_in.subs.dvb.i_id & 0xFFFF; p_sys->i_ancillary_id = p_dec->fmt_in.subs.dvb.i_id >> 16; @@ -397,7 +397,7 @@ { decoder_sys_t *p_sys = p_dec->p_sys; - p_sys->i_pts = VLC_TS_INVALID; + p_sys->i_pts = VLC_TICK_INVALID; } /***************************************************************************** @@ -426,7 +426,7 @@ default_dds_init( p_dec ); p_sys->i_pts = p_block->i_pts; - if( p_sys->i_pts <= VLC_TS_INVALID ) + if( p_sys->i_pts <= VLC_TICK_INVALID ) { #ifdef DEBUG_DVBSUB /* Some DVB channels send stuffing segments in non-dated packets so @@ -1503,10 +1503,10 @@ p_spu->b_absolute = p_sys->b_absolute; /* Set the pf_render callback */ p_spu->i_start = p_sys->i_pts; - //p_spu->i_stop = (mtime_t) 0; + //p_spu->i_stop = (vlc_tick_t) 0; p_spu->b_ephemer = true; //p_spu->b_fade = true; - //p_spu->i_stop = p_spu->i_start + (mtime_t) (i_timeout * 10000